diff -ur calamares-3.2.8/CMakeLists.txt calamares-3.2.8-default-settings/CMakeLists.txt
--- calamares-3.2.8/CMakeLists.txt 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/CMakeLists.txt 2019-05-11 01:30:06.746889778 +0200
@@ -44,7 +44,7 @@
### OPTIONS
#
-option( INSTALL_CONFIG "Install configuration files" OFF )
+option( INSTALL_CONFIG "Install configuration files" ON )
option( INSTALL_POLKIT "Install Polkit configuration" ON )
option( BUILD_TESTING "Build the testing tree." ON )
option( WITH_PYTHON "Enable Python modules API (requires Boost.Python)." ON )
diff -ur calamares-3.2.8/settings.conf calamares-3.2.8-default-settings/settings.conf
--- calamares-3.2.8/settings.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/settings.conf 2019-05-12 15:09:16.025709856 +0200
@@ -92,21 +92,22 @@
- locale
- keyboard
- localecfg
-# - luksbootkeyfile
+ - luksbootkeyfile
# - luksopenswaphookcfg
-# - dracutlukscfg
+ - dracutlukscfg
# - plymouthcfg
- - initcpiocfg
- - initcpio
+# - initcpiocfg
+# - initcpio
- users
- displaymanager
- networkcfg
- hwclock
- services-systemd
-# - dracut
- - initramfs
-# - grubcfg
+ - dracut
+# - initramfs
+ - grubcfg
- bootloader
+ - packages
- umount
- show:
# - webview@owncloud
@@ -124,7 +125,7 @@
# here, Calamares then takes care of finding it and loading the contents.
#
# YAML: string.
-branding: default
+branding: auto
# If this is set to true, Calamares will show an "Are you sure?" prompt right
# before each execution phase, i.e. at points of no return. If this is set to
@@ -152,7 +153,7 @@
# If this is set to true, Calamares refers to itself as a "setup program"
# rather than an "installer". Defaults to the value of dont-chroot, but
# Calamares will complain if this is not explicitly set.
-# oem-setup: true
+oem-setup: false
# If this is set to true, the "Cancel" button will be disabled entirely.
# The button is also hidden from view.
diff -ur calamares-3.2.8/src/modules/bootloader/bootloader.conf calamares-3.2.8-default-settings/src/modules/bootloader/bootloader.conf
--- calamares-3.2.8/src/modules/bootloader/bootloader.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/bootloader/bootloader.conf 2019-05-11 01:30:06.860888023 +0200
@@ -4,7 +4,7 @@
---
# Define which bootloader you want to use for EFI installations
# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
-efiBootLoader: "grub"
+efiBootLoader: "sb-shim"
# systemd-boot configuration files settings, set kernel and initramfs file names
# and amount of time before default selection boots
@@ -26,10 +26,10 @@
# GRUB functionality (notably grub-probe) to work. As needed, you may use
# complete paths like `/usr/bin/efibootmgr` for the executables.
#
-grubInstall: "grub-install"
-grubMkconfig: "grub-mkconfig"
-grubCfg: "/boot/grub/grub.cfg"
-grubProbe: "grub-probe"
+grubInstall: "grub2-install"
+grubMkconfig: "grub2-mkconfig"
+grubCfg: "/boot/grub2/grub.cfg"
+grubProbe: "grub2-probe"
efiBootMgr: "efibootmgr"
# Optionally set the bootloader ID to use for EFI. This is passed to
@@ -43,7 +43,9 @@
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
-# 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"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
diff -ur calamares-3.2.8/src/modules/keyboard/keyboard.conf calamares-3.2.8-default-settings/src/modules/keyboard/keyboard.conf
--- calamares-3.2.8/src/modules/keyboard/keyboard.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/keyboard/keyboard.conf 2019-05-11 01:30:06.860888023 +0200
@@ -13,4 +13,4 @@
# Write keymap configuration to /etc/default/keyboard, usually
# found on Debian-related systems.
# Defaults to true if nothing is set.
-#writeEtcDefaultKeyboard: true
+writeEtcDefaultKeyboard: false
diff -ur calamares-3.2.8/src/modules/license/license.conf calamares-3.2.8-default-settings/src/modules/license/license.conf
--- calamares-3.2.8/src/modules/license/license.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/license/license.conf 2019-05-11 01:30:06.860888023 +0200
@@ -15,24 +15,12 @@
# URL (i.e. file:///) assumes that the contents are HTML or plain text, and
# displays the license in-line. YAML: string, mandatory.
entries:
-- id: nvidia
- name: Nvidia
- vendor: Nvidia Corporation
+- id: evil
+ name: Evil
+ vendor: Evil Corporation
type: driver
- url: http://developer.download.nvidia.com/cg/Cg_3.0/license.pdf
+ url: http://www.example.com/evil_666.0/license.pdf
required: false
-- id: amd
- name: Catalyst
- vendor: "Advanced Micro Devices, Inc."
- type: gpudriver
- url: http://support.amd.com/en-us/download/eula
- required: false
-- id: flashplugin
- name: Adobe Flash
- vendor: Adobe Systems Incorporated
- type: browserplugin
- url: http://www.adobe.com/products/eulas/pdfs/PlatformClients_PC_WWEULA_Combined_20100108_1657.pdf
- required: true
# This example uses a file: link. This example uses a relative link, which
# is relative to where you run Calamares. Assuming you run it from build/
# as part of your testing, you'll get the LICENSE text for Calamares
diff -ur calamares-3.2.8/src/modules/locale/locale.conf calamares-3.2.8-default-settings/src/modules/locale/locale.conf
--- calamares-3.2.8/src/modules/locale/locale.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/locale/locale.conf 2019-05-11 01:34:35.592749013 +0200
@@ -85,7 +85,7 @@
#
# Legacy settings "geoipStyle", "geoipUrl" and "geoipSelector"
# in the top-level are still supported, but I'd advise against.
-geoip:
- style: "json"
- url: "https://geoip.kde.org/v1/calamares"
- selector: "" # leave blank for the default
+#geoip:
+# style: "json"
+# url: "https://geoip.kde.org/v1/calamares"
+# selector: "" # leave blank for the default
diff -ur calamares-3.2.8/src/modules/netinstall/netinstall.conf calamares-3.2.8-default-settings/src/modules/netinstall/netinstall.conf
--- calamares-3.2.8/src/modules/netinstall/netinstall.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/netinstall/netinstall.conf 2019-05-11 01:30:06.861888007 +0200
@@ -5,6 +5,9 @@
# or it can be a locally installed file:
# groupsUrl: file:///usr/share/calamares/netinstall.yaml
# groupsUrl: file:///usr/share/calamares/netinstall.yaml
+# Packager note: If you want to enable the netinstall module, you will also have
+# to create such a file (see the example in the source code).
+groupsUrl: file:///etc/calamares/modules/netinstall.yaml
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
diff -ur calamares-3.2.8/src/modules/packages/packages.conf calamares-3.2.8-default-settings/src/modules/packages/packages.conf
--- calamares-3.2.8/src/modules/packages/packages.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/packages/packages.conf 2019-05-11 01:30:06.861888007 +0200
@@ -12,7 +12,7 @@
# - entropy - Sabayon package manager
# - dummy - Dummy manager, only logs
#
-backend: dummy
+backend: dnf
#
# Often package installation needs an internet connection.
@@ -36,7 +36,7 @@
# Therefore set also "update_system" to 'true'.
#
skip_if_no_internet: false
-update_db: true
+update_db: false
update_system: false
#
@@ -143,12 +143,5 @@
# of packages, this can lead to a considerable time savings.
#
operations:
- - install:
- - vi
- - vi-${LOCALE}
- - wget
- - binutils
- - remove:
- - vi
- - wget
- - binutils
+ - try_remove:
+ - calamares
diff -ur calamares-3.2.8/src/modules/partition/partition.conf calamares-3.2.8-default-settings/src/modules/partition/partition.conf
--- calamares-3.2.8/src/modules/partition/partition.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/partition/partition.conf 2019-05-12 15:08:24.524412322 +0200
@@ -29,18 +29,18 @@
# is some space for administrative overhead (e.g. 8 GiB swap will allocate
# 8.8GiB on disk in the end).
userSwapChoices:
- - none # Create no swap, use no swap
- - reuse # Re-use existing swap, but don't create any
- - small # Up to 4GB
- suspend # At least main memory size
- - file # To swap file instead of partition (unsupported right now)
+ - small # Up to 4GB
+ - none # Create no swap, use no swap
+# - reuse # Re-use existing swap, but don't create any (unsupported now)
+# - file # To swap file instead of partition (unsupported right now)
# LEGACY SETTINGS (these will generate a warning)
# ensureSuspendToDisk: true
# neverCreateSwap: false
# Correctly draw nested (e.g. logical) partitions as such.
-drawNestedPartitions: false
+drawNestedPartitions: true
# Show/hide partition labels on manual partitioning page.
alwaysShowPartitionLabels: true
diff -ur calamares-3.2.8/src/modules/plasmalnf/plasmalnf.conf calamares-3.2.8-default-settings/src/modules/plasmalnf/plasmalnf.conf
--- calamares-3.2.8/src/modules/plasmalnf/plasmalnf.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/plasmalnf/plasmalnf.conf 2019-05-11 01:30:06.861888007 +0200
@@ -19,7 +19,7 @@
# to the originating username; the lnftool will be run through
# "sudo -H -u <liveuser>" instead of directly.
#
-# liveuser: "live"
+liveuser: "liveuser"
# You can limit the list of Plasma look-and-feel themes by listing ids
# here. If this key is not present, all of the installed themes are listed.
@@ -47,20 +47,20 @@
# The image screenshot is resized to 12x8 the current font size, with
# a minimum of 120x80 pixels. This allows the screenshot to scale up
# on HiDPI displays where the fonts are larger (in pixels).
-themes:
- - org.kde.fuzzy-pig.desktop
- - theme: org.kde.breeze.desktop
- image: "breeze.png"
- - theme: org.kde.breezedark.desktop
- image: "breeze-dark.png"
- - org.kde.fluffy-bunny.desktop
+#themes:
+# - org.kde.fuzzy-pig.desktop
+# - theme: org.kde.breeze.desktop
+# image: "breeze.png"
+# - theme: org.kde.breezedark.desktop
+# image: "breeze-dark.png"
+# - org.kde.fluffy-bunny.desktop
# If *showAll* is true, then all installed themes are shown in the
# UI for selection, even if they are not listed in *themes*. This
# allows selection of all themes even while not all of them are
# listed in *themes* -- which is useful to show screenshots for those
# you do have a screenshot for.
-showAll: false
+showAll: true
# You can pre-select one of the themes; it is not applied
# immediately, but its radio-button is switched on to indicate
diff -ur calamares-3.2.8/src/modules/tracking/tracking.conf calamares-3.2.8-default-settings/src/modules/tracking/tracking.conf
--- calamares-3.2.8/src/modules/tracking/tracking.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/tracking/tracking.conf 2019-05-11 01:30:06.862887992 +0200
@@ -54,7 +54,7 @@
# This is the default level to enable for tracking. If commented out,
# empty, or otherwise invalid, "none" is used, so no tracking by default.
-default: user
+default: none
# The install area has one specific configuration key:
# url: this URL (remember to include the protocol, and prefer https)
diff -ur calamares-3.2.8/src/modules/umount/umount.conf calamares-3.2.8-default-settings/src/modules/umount/umount.conf
--- calamares-3.2.8/src/modules/umount/umount.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/umount/umount.conf 2019-05-11 01:38:21.417270846 +0200
@@ -35,8 +35,8 @@
---
# example when using the normal Calamares log:
srcLog: "/root/.cache/calamares/session.log"
-destLog: "/var/log/Calamares.log"
+destLog: "/var/log/calamares.log"
# example when using a log created by `sudo calamares -d`:
-#srcLog: "/home/live/installation.log"
+#srcLog: "/home/liveuser/installation.log"
#destLog: "/var/log/installation.log"
diff -ur calamares-3.2.8/src/modules/unpackfs/unpackfs.conf calamares-3.2.8-default-settings/src/modules/unpackfs/unpackfs.conf
--- calamares-3.2.8/src/modules/unpackfs/unpackfs.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/unpackfs/unpackfs.conf 2019-05-11 01:30:09.072853955 +0200
@@ -33,6 +33,10 @@
# You can list filesystem source paths relative to the Calamares run
# directory, if you use -d (this is only useful for testing, though).
- - source: ./example.sqfs
- sourcefs: squashfs
+# - source: ./example.sqfs
+# sourcefs: squashfs
+# destination: ""
+
+ - source: "/dev/mapper/live-base"
+ sourcefs: "ext4"
destination: ""
diff -ur calamares-3.2.8/src/modules/users/users.conf calamares-3.2.8-default-settings/src/modules/users/users.conf
--- calamares-3.2.8/src/modules/users/users.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/users/users.conf 2019-05-11 01:30:09.148852783 +0200
@@ -17,8 +17,7 @@
- users
- lp
- video
- - network
- - storage
+ - dialout
- wheel
- audio
@@ -29,7 +28,7 @@
autologinGroup: autologin
# You can control the initial state for the 'autologin checkbox' in UsersViewStep here.
# Possible values are: true to enable or false to disable the checkbox by default
-doAutologin: true
+doAutologin: false
# When set to a non-empty string, Calamares creates a sudoers file for the user.
# /etc/sudoers.d/10-installer
@@ -39,7 +38,7 @@
# remove this setting (delete or comment out the line below). Otherwise,
# the setting will be duplicated in the /etc/sudoers.d/10-installer file,
# potentially confusing users.
-sudoersGroup: wheel
+#sudoersGroup: wheel
# Setting this to false , causes the root account to be disabled.
setRootPassword: true
@@ -71,9 +70,9 @@
passwordRequirements:
minLength: -1 # Password at least this many characters
maxLength: -1 # Password at most this many characters
- libpwquality:
- - minlen=0
- - minclass=0
+# libpwquality:
+# - minlen=0
+# - minclass=0
# Shell to be used for the regular user of the target system.
# There are three possible kinds of settings:
@@ -82,4 +81,4 @@
# and rely on a correct configuration file in /etc/default/useradd
# - set, non-empty, use that path as shell. No validation is done
# that the shell actually exists or is executable.
-# userShell: /bin/bash
+userShell: ""
diff -ur calamares-3.2.8/src/modules/welcome/welcome.conf calamares-3.2.8-default-settings/src/modules/welcome/welcome.conf
--- calamares-3.2.8/src/modules/welcome/welcome.conf 2019-05-11 01:00:11.000000000 +0200
+++ calamares-3.2.8-default-settings/src/modules/welcome/welcome.conf 2019-05-11 01:40:46.606034649 +0200
@@ -25,7 +25,7 @@
# To check for internet connectivity, Calamares does a HTTP GET
# on this URL; on success (e.g. HTTP code 200) internet is OK.
- internetCheckUrl: http://google.com
+ internetCheckUrl: https://fedoraproject.org/static/hotspot.txt
# List conditions to check. Each listed condition will be
# probed in some way, and yields true or false according to
@@ -44,9 +44,9 @@
# If any of these conditions are not met, the user cannot
# continue past the welcome page.
required:
- # - storage
+ - storage
- ram
- # - root
+ - root
# GeoIP checking
#
@@ -55,8 +55,8 @@
# connectivity, though. Configuration is like in the locale module,
# but remember to use a URL that returns full data **and** to
# use a selector that will pick the country, not the timezone.
-
-geoip:
- style: "xml"
- url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
- selector: "CountryCode" # blank uses default, which is wrong
+#
+#geoip:
+# style: "xml"
+# url: "https://geoip.kde.org/v1/ubiquity" # extended XML format
+# selector: "CountryCode" # blank uses default, which is wrong