Blob Blame Raw
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf calamares-default-settings/settings.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/settings.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/settings.conf	2015-01-10 03:52:57.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).
@@ -39,18 +39,19 @@
 - locale
 - keyboard
 - localecfg
-- initcpiocfg
-- initcpio
+#- initcpiocfg
+#- initcpio
 - users
-#- displaymanager
+- displaymanager
 - networkcfg
 - hwclock
 - services
-#- dracut
+- dracut
 #- initramfs
 - grubcfg
 - grub
 #- bootloader
+- packages
 - umount
 
 # Phase 3 - postinstall.
@@ -67,4 +68,4 @@
 # paths relative to the current directory.
 # Only the name of the branding component (directory) should be specified here, Calamares
 # then takes care of finding it and loading the contents.
-branding: default
+branding: auto
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf calamares-default-settings/src/modules/grub/grub.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/grub/grub.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/src/modules/grub/grub.conf	2015-01-10 03:48:13.000000000 +0100
@@ -1,11 +1,13 @@
 ---
 # 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"
 # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
 # to the bootloaderEntryName from branding.desc with problematic characters
 # replaced. If an efiBootloaderId is specified here, it is taken to already be a
 # valid directory name, so no such postprocessing is done in this case.
-# efiBootloaderId: "dirname"
+# PACKAGER NOTE: If you really want to change this value, you will also have to
+#                change the hardcoded directory name in the grub2(-efi) package.
+efiBootloaderId: "fedora"
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf calamares-default-settings/src/modules/locale/locale.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/locale/locale.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/src/modules/locale/locale.conf	2015-01-10 03:48:13.000000000 +0100
@@ -1,3 +1,4 @@
 ---
-region:     "Europe"
-zone:       "London"
+# default to UTC
+region:     "Atlantic"
+zone:       "Reykjavik"
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf calamares-default-settings/src/modules/packages/packages.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/packages/packages.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/src/modules/packages/packages.conf	2015-01-10 04:15:14.000000000 +0100
@@ -9,7 +9,7 @@
 #  - apt         - APT frontend for DEB and RPM
 #  - pacman      - Pacman
 #
-backend: packagekit
+backend: dnf
 #
 # List of maps with package operations such as install or remove.
 # Distro developers can provide a list of packages to remove
@@ -24,18 +24,7 @@
 # storage called "packageOperations" and it is processed
 # after the static list in the job configuration.
 #
-#operations:
+operations:
+  - remove:
+    - calamares
 #  - install:
-#      - pkg1
-#      - pkg2
-#  - remove:
-#      - pkg3
-#      - pkg4
-#  - install:
-#      - pkg5
-#  - remove:
-#      - pkg2
-#      - pkg1
-#    install:
-#      - pkgs6
-#      - pkg7
diff -ur calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf calamares-default-settings/src/modules/unpackfs/unpackfs.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/unpackfs/unpackfs.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/src/modules/unpackfs/unpackfs.conf	2015-01-10 03:48:13.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-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf calamares-default-settings/src/modules/users/users.conf
--- calamares-fe44633e0ca5205b6eb4baf55c3a3867a6d17c73/src/modules/users/users.conf	2015-01-05 09:45:40.000000000 +0100
+++ calamares-default-settings/src/modules/users/users.conf	2015-01-10 03:48:13.000000000 +0100
@@ -3,8 +3,7 @@
 defaultGroups:
     - lp
     - video
-    - network
-    - storage
+    - dialout
     - wheel
     - audio
 autologinGroup: autologin