Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/settings.conf calamares-1.1.2-default-settings/settings.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/settings.conf	2015-07-06 12:14:29.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/settings.conf	2015-08-17 02:46:44.192625353 +0200
Kevin Kofler 5e9b006
@@ -41,17 +41,18 @@
Kevin Kofler e9ec4ff
 - locale
Kevin Kofler e9ec4ff
 - keyboard
Kevin Kofler 0231205
 - localecfg
Kevin Kofler e9ec4ff
-- initcpiocfg
Kevin Kofler e9ec4ff
-- initcpio
Kevin Kofler 0231205
+#- initcpiocfg
Kevin Kofler 0231205
+#- initcpio
Kevin Kofler e9ec4ff
 - users
Kevin Kofler 5e9b006
 - displaymanager
Kevin Kofler e9ec4ff
 - networkcfg
Kevin Kofler e9ec4ff
 - hwclock
Kevin Kofler e9ec4ff
 - services
Kevin Kofler 0231205
-#- dracut
Kevin Kofler 0231205
+- dracut
Kevin Kofler 0231205
 #- initramfs
Kevin Kofler 0231205
 - grubcfg
Kevin Kofler 8f93faa
 - bootloader
Kevin Kofler a2598f5
+- packages
Kevin Kofler a2598f5
 - umount
Kevin Kofler a2598f5
 
Kevin Kofler a2598f5
 # Phase 3 - postinstall.
Kevin Kofler 5e9b006
@@ -68,7 +69,7 @@
Kevin Kofler 5e9b006
 # as paths relative to the current directory.
Kevin Kofler d99ca50
 # Only the name of the branding component (directory) should be specified here, Calamares
Kevin Kofler d99ca50
 # then takes care of finding it and loading the contents.
Kevin Kofler d99ca50
-branding: default
Kevin Kofler d99ca50
+branding: auto
Kevin Kofler 8f93faa
 
Kevin Kofler 8f93faa
 # If this is set to true, Calamares will show an "are you sure?" prompt right before the
Kevin Kofler 8f93faa
 # install phase, i.e. at the point of no return. If it's false, no prompt is shown.
Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/src/modules/bootloader/bootloader.conf calamares-1.1.2-default-settings/src/modules/bootloader/bootloader.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/src/modules/bootloader/bootloader.conf	2015-06-11 00:32:50.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/src/modules/bootloader/bootloader.conf	2015-08-17 02:45:20.136100632 +0200
Kevin Kofler 8f93faa
@@ -17,11 +17,13 @@
Kevin Kofler 8f93faa
 
Kevin Kofler 0231205
 # GRUB 2 binary names and boot directory
Kevin Kofler 0231205
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
Kevin Kofler 0231205
-grubInstall: "grub-install"
Kevin Kofler 0231205
-grubMkconfig: "grub-mkconfig"
Kevin Kofler 0231205
-grubCfg: "/boot/grub/grub.cfg"
Kevin Kofler 0231205
+grubInstall: "grub2-install"
Kevin Kofler 0231205
+grubMkconfig: "grub2-mkconfig"
Kevin Kofler 0231205
+grubCfg: "/boot/grub2/grub.cfg"
Kevin Kofler e2f1e7d
 # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
Kevin Kofler e2f1e7d
 # to the bootloaderEntryName from branding.desc with problematic characters
Kevin Kofler e2f1e7d
 # replaced. If an efiBootloaderId is specified here, it is taken to already be a
Kevin Kofler e2f1e7d
 # valid directory name, so no such postprocessing is done in this case.
Kevin Kofler e2f1e7d
-# efiBootloaderId: "dirname"
Kevin Kofler e2f1e7d
+# PACKAGER NOTE: If you really want to change this value, you will also have to
Kevin Kofler e2f1e7d
+#                change the hardcoded directory name in the grub2(-efi) package.
Kevin Kofler e2f1e7d
+efiBootloaderId: "fedora"
Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/src/modules/locale/locale.conf calamares-1.1.2-default-settings/src/modules/locale/locale.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/src/modules/locale/locale.conf	2015-04-10 13:29:23.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/src/modules/locale/locale.conf	2015-08-17 02:45:20.136100632 +0200
Kevin Kofler e9ec4ff
@@ -1,3 +1,4 @@
Kevin Kofler e9ec4ff
 ---
Kevin Kofler e9ec4ff
-region:     "Europe"
Kevin Kofler e9ec4ff
-zone:       "London"
Kevin Kofler e9ec4ff
+# default to UTC
Kevin Kofler e9ec4ff
+region:     "Atlantic"
Kevin Kofler e9ec4ff
+zone:       "Reykjavik"
Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/src/modules/packages/packages.conf calamares-1.1.2-default-settings/src/modules/packages/packages.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/src/modules/packages/packages.conf	2015-06-08 19:31:40.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/src/modules/packages/packages.conf	2015-08-17 02:45:20.136100632 +0200
Kevin Kofler 5e9b006
@@ -11,7 +11,7 @@
Kevin Kofler 5e9b006
 #  - portage	 - Gentoo package manager
Kevin Kofler 5e9b006
 #  - entropy	 - Sabayon package manager
Kevin Kofler a2598f5
 #
Kevin Kofler a2598f5
-backend: packagekit
Kevin Kofler a2598f5
+backend: dnf
Kevin Kofler a2598f5
 #
Kevin Kofler a2598f5
 # List of maps with package operations such as install or remove.
Kevin Kofler a2598f5
 # Distro developers can provide a list of packages to remove
Kevin Kofler 5e9b006
@@ -26,20 +26,7 @@
Kevin Kofler a2598f5
 # storage called "packageOperations" and it is processed
Kevin Kofler a2598f5
 # after the static list in the job configuration.
Kevin Kofler a2598f5
 #
Kevin Kofler a2598f5
-#operations:
Kevin Kofler a2598f5
+operations:
Kevin Kofler a2598f5
+  - remove:
Kevin Kofler a2598f5
+    - calamares
Kevin Kofler a2598f5
 #  - install:
Kevin Kofler a2598f5
-#      - pkg1
Kevin Kofler a2598f5
-#      - pkg2
Kevin Kofler a2598f5
-#  - remove:
Kevin Kofler a2598f5
-#      - pkg3
Kevin Kofler a2598f5
-#      - pkg4
Kevin Kofler a2598f5
-#  - install:
Kevin Kofler a2598f5
-#      - pkg5
Kevin Kofler a2598f5
-#  - remove:
Kevin Kofler a2598f5
-#      - pkg2
Kevin Kofler a2598f5
-#      - pkg1
Kevin Kofler a2598f5
-#    install:
Kevin Kofler a2598f5
-#      - pkgs6
Kevin Kofler a2598f5
-#      - pkg7
Kevin Kofler 8f93faa
-#  - localInstall:
Kevin Kofler 8f93faa
-#      - /path/to/pkg8
Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/src/modules/unpackfs/unpackfs.conf calamares-1.1.2-default-settings/src/modules/unpackfs/unpackfs.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/src/modules/unpackfs/unpackfs.conf	2015-04-10 13:29:21.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/src/modules/unpackfs/unpackfs.conf	2015-08-17 02:45:20.136100632 +0200
Kevin Kofler e9ec4ff
@@ -1,8 +1,5 @@
Kevin Kofler e9ec4ff
 ---
Kevin Kofler e9ec4ff
 unpack:
Kevin Kofler e9ec4ff
-    -   source: "/path/to/filesystem.img"
Kevin Kofler e9ec4ff
+    -   source: "/dev/mapper/live-base"
Kevin Kofler e9ec4ff
         sourcefs: "ext4"
Kevin Kofler e9ec4ff
         destination: ""
Kevin Kofler e9ec4ff
-    -   source: "/path/to/another/filesystem.sqfs"
Kevin Kofler e9ec4ff
-        sourcefs: "squashfs"
Kevin Kofler e9ec4ff
-        destination: ""
Kevin Kofler 5e9b006
diff -ur calamares-1.1.2/src/modules/users/users.conf calamares-1.1.2-default-settings/src/modules/users/users.conf
Kevin Kofler 5e9b006
--- calamares-1.1.2/src/modules/users/users.conf	2015-06-11 03:59:30.000000000 +0200
Kevin Kofler 5e9b006
+++ calamares-1.1.2-default-settings/src/modules/users/users.conf	2015-08-17 02:45:20.137100639 +0200
Kevin Kofler e9ec4ff
@@ -3,8 +3,7 @@
Kevin Kofler e9ec4ff
 defaultGroups:
Kevin Kofler e9ec4ff
     - lp
Kevin Kofler e9ec4ff
     - video
Kevin Kofler e9ec4ff
-    - network
Kevin Kofler e9ec4ff
-    - storage
Kevin Kofler e9ec4ff
+    - dialout
Kevin Kofler e9ec4ff
     - wheel
Kevin Kofler e9ec4ff
     - audio
Kevin Kofler 5e9b006
 autologinGroup:  autologin