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