Blob Blame History Raw
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/settings.conf calamares-default-settings/settings.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/settings.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/settings.conf	2014-11-15 04:36:58.000000000 +0100
@@ -4,7 +4,7 @@
 # Modules can be job modules (with different interfaces) and QtWidgets view modules.
 # They could all be placed in a number of different paths.
 # "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [ local, /path/to/dir/with/more/modules ]
+modules-search: [ local ]
 
 # We define the module names in the order they should show up (QtWidget view modules,
 # with one or more pages) OR be executed if enqueued (all other modules).
@@ -38,14 +38,14 @@
 - locale
 - keyboard
 - localecfg
-- initcpiocfg
-- initcpio
+#- initcpiocfg
+#- initcpio
 - users
-#- displaymanager
+- displaymanager
 - networkcfg
 - hwclock
 - services
-#- dracut
+- dracut
 #- initramfs
 - grubcfg
 - grub
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/displaymanager/displaymanager.conf calamares-default-settings/src/modules/displaymanager/displaymanager.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/displaymanager/displaymanager.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/src/modules/displaymanager/displaymanager.conf	2014-11-15 04:48:36.000000000 +0100
@@ -3,10 +3,4 @@
 #It also sets up autologin, if the feature is enabled in globalstorage.
 #The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here.
 displaymanagers:
-  - slim
   - sddm
-  - lightdm
-  - gdm
-  - mdm
-  - lxdm
-  - kdm
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/grub/grub.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/src/modules/grub/grub.conf	2014-11-15 04:48:36.000000000 +0100
@@ -1,6 +1,6 @@
 ---
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
-grubInstall: "grub-install"
-grubMkconfig: "grub-mkconfig"
-grubCfg: "/boot/grub/grub.cfg"
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub2/grub.cfg"
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/locale/locale.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/src/modules/locale/locale.conf	2014-11-15 04:48:36.000000000 +0100
@@ -1,3 +1,4 @@
 ---
-region:     "Europe"
-zone:       "London"
+# default to UTC
+region:     "Atlantic"
+zone:       "Reykjavik"
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/unpackfs/unpackfs.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf	2014-11-15 04:48:36.000000000 +0100
@@ -1,8 +1,5 @@
 ---
 unpack:
-    -   source: "/path/to/filesystem.img"
+    -   source: "/dev/mapper/live-base"
         sourcefs: "ext4"
         destination: ""
-    -   source: "/path/to/another/filesystem.sqfs"
-        sourcefs: "squashfs"
-        destination: ""
diff -ur calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
--- calamares-6b2ccfb442defc1ffeb9359edd892aae5335b838/src/modules/users/users.conf	2014-11-15 04:44:09.000000000 +0100
+++ calamares-default-settings/src/modules/users/users.conf	2014-11-15 04:48:36.000000000 +0100
@@ -3,8 +3,7 @@
 defaultGroups:
     - lp
     - video
-    - network
-    - storage
+    - dialout
     - wheel
     - audio
 autologinGroup: autologin