{!s} to use."
-msgstr "No partitions are defined for {!s} to use."
+msgstr ""
-#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
-#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:367
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:240
#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
-#: src/modules/luksopenswaphookcfg/main.py:91
msgid "No root mount point is given for {!s} to use."
-msgstr "No root mount point is given for {!s} to use."
+msgstr ""
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
-msgstr "Configure GRUB."
+msgstr ""
#: src/modules/bootloader/main.py:43
msgid "Install bootloader."
-msgstr "Install bootloader."
-
-#: src/modules/bootloader/main.py:508
-msgid "Bootloader installation error"
-msgstr "Bootloader installation error"
-
-#: src/modules/bootloader/main.py:509
-msgid ""
-"The bootloader could not be installed. The installation command "
-"{!s} returned error code {!s}."
msgstr ""
-"The bootloader could not be installed. The installation command "
-"{!s} returned error code {!s}."
+
+#: src/modules/bootloader/main.py:612
+msgid "Failed to install grub, no partitions defined in global storage"
+msgstr ""
+
+#: src/modules/bootloader/main.py:780
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:781
+msgid ""
+"The bootloader could not be installed. The installation command {!s} returned error code {!s}."
+msgstr ""
#: src/modules/fstab/main.py:29
msgid "Writing fstab."
-msgstr "Writing fstab."
+msgstr ""
-#: src/modules/fstab/main.py:389
+#: src/modules/fstab/main.py:394
msgid "No {!s} configuration is given for {!s} to use."
-msgstr "No {!s} configuration is given for {!s} to use."
+msgstr ""
#: src/modules/dracut/main.py:27
msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+msgstr ""
#: src/modules/dracut/main.py:49
msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+msgstr ""
#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
msgid "The exit code was {}"
-msgstr "The exit code was {}"
+msgstr ""
-#: src/modules/displaymanager/main.py:526
+#: src/modules/displaymanager/main.py:524
msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+msgstr ""
-#: src/modules/displaymanager/main.py:527
+#: src/modules/displaymanager/main.py:525
msgid "KDM config file {!s} does not exist"
-msgstr "KDM config file {!s} does not exist"
+msgstr ""
-#: src/modules/displaymanager/main.py:588
+#: src/modules/displaymanager/main.py:586
msgid "Cannot write LXDM configuration file"
-msgstr "Cannot write LXDM configuration file"
+msgstr ""
-#: src/modules/displaymanager/main.py:589
+#: src/modules/displaymanager/main.py:587
msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM config file {!s} does not exist"
+msgstr ""
-#: src/modules/displaymanager/main.py:672
+#: src/modules/displaymanager/main.py:670
msgid "Cannot write LightDM configuration file"
-msgstr "Cannot write LightDM configuration file"
+msgstr ""
-#: src/modules/displaymanager/main.py:673
+#: src/modules/displaymanager/main.py:671
msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM config file {!s} does not exist"
+msgstr ""
-#: src/modules/displaymanager/main.py:747
+#: src/modules/displaymanager/main.py:745
msgid "Cannot configure LightDM"
-msgstr "Cannot configure LightDM"
+msgstr ""
-#: src/modules/displaymanager/main.py:748
+#: src/modules/displaymanager/main.py:746
msgid "No LightDM greeter installed."
-msgstr "No LightDM greeter installed."
+msgstr ""
-#: src/modules/displaymanager/main.py:779
+#: src/modules/displaymanager/main.py:777
msgid "Cannot write SLIM configuration file"
-msgstr "Cannot write SLIM configuration file"
+msgstr ""
-#: src/modules/displaymanager/main.py:780
+#: src/modules/displaymanager/main.py:778
msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM config file {!s} does not exist"
+msgstr ""
-#: src/modules/displaymanager/main.py:906
+#: src/modules/displaymanager/main.py:991
msgid "No display managers selected for the displaymanager module."
-msgstr "No display managers selected for the displaymanager module."
+msgstr ""
-#: src/modules/displaymanager/main.py:907
+#: src/modules/displaymanager/main.py:992
msgid ""
"The displaymanagers list is empty or undefined in both globalstorage and "
"displaymanager.conf."
msgstr ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
-#: src/modules/displaymanager/main.py:989
+#: src/modules/displaymanager/main.py:1074
msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuration was incomplete"
+msgstr ""
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
+msgstr ""
#: src/modules/services-openrc/main.py:57
msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
#: src/modules/services-openrc/main.py:59
msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
#: src/modules/services-openrc/main.py:61
msgid ""
"Unknown service-action {arg!s} for service {name!s} in run-"
"level {level!s}."
msgstr ""
-"Unknown service-action {arg!s} for service {name!s} in run-"
-"level {level!s}."
#: src/modules/services-openrc/main.py:93
#: src/modules/services-systemd/main.py:59
msgid "Cannot modify service"
-msgstr "Cannot modify service"
+msgstr ""
#: src/modules/services-openrc/main.py:94
msgid ""
"rc-update {arg!s} call in chroot returned error code {num!s}."
msgstr ""
-"rc-update {arg!s} call in chroot returned error code {num!s}."
#: src/modules/services-openrc/main.py:101
msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
+msgstr ""
#: src/modules/services-openrc/main.py:102
msgid ""
"The path for runlevel {level!s} is {path!s}, which does not "
"exist."
msgstr ""
-"The path for runlevel {level!s} is {path!s}, which does not "
-"exist."
#: src/modules/services-openrc/main.py:110
msgid "Target service does not exist"
-msgstr "Target service does not exist"
+msgstr ""
#: src/modules/services-openrc/main.py:111
msgid ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
+"The path for service {name!s} is {path!s}, which does not exist."
msgstr ""
-"The path for service {name!s} is {path!s}, which does not "
-"exist."
#: src/modules/networkcfg/main.py:29
msgid "Saving network configuration."
-msgstr "Saving network configuration."
+msgstr ""
-#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
-#: src/modules/packages/main.py:69
+#: src/modules/packages/main.py:54 src/modules/packages/main.py:65
+#: src/modules/packages/main.py:75
msgid "Install packages."
-msgstr "Install packages."
+msgstr ""
-#: src/modules/packages/main.py:57
+#: src/modules/packages/main.py:63
#, python-format
msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+msgstr ""
-#: src/modules/packages/main.py:62
+#: src/modules/packages/main.py:68
#, python-format
msgid "Installing one package."
msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
-#: src/modules/packages/main.py:65
+#: src/modules/packages/main.py:71
#, python-format
msgid "Removing one package."
msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
-#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
-#: src/modules/packages/main.py:678
+#: src/modules/packages/main.py:725 src/modules/packages/main.py:737
+#: src/modules/packages/main.py:765
msgid "Package Manager error"
-msgstr "Package Manager error"
+msgstr ""
-#: src/modules/packages/main.py:639
+#: src/modules/packages/main.py:726
msgid ""
"The package manager could not prepare updates. The command {!s} "
"returned error code {!s}."
msgstr ""
-"The package manager could not prepare updates. The command {!s} "
+
+#: src/modules/packages/main.py:738
+msgid ""
+"The package manager could not update the system. The command {!s} "
"returned error code {!s}."
-
-#: src/modules/packages/main.py:651
-msgid ""
-"The package manager could not update the system. The command {!s}"
-" returned error code {!s}."
msgstr ""
-"The package manager could not update the system. The command {!s}"
-" returned error code {!s}."
-#: src/modules/packages/main.py:679
+#: src/modules/packages/main.py:766
msgid ""
"The package manager could not make changes to the installed system. The "
"command {!s} returned error code {!s}."
msgstr ""
-"The package manager could not make changes to the installed system. The "
-"command {!s} returned error code {!s}."
#: src/modules/plymouthcfg/main.py:27
msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
+msgstr ""
#: src/modules/initcpiocfg/main.py:28
msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+msgstr ""
#: src/modules/localecfg/main.py:30
msgid "Configuring locales."
-msgstr "Configuring locales."
+msgstr ""
-#: src/modules/mount/main.py:30
+#: src/modules/mount/main.py:42
msgid "Mounting partitions."
-msgstr "Mounting partitions."
+msgstr ""
+
+#: src/modules/mount/main.py:88 src/modules/mount/main.py:124
+msgid "Internal error mounting zfs datasets"
+msgstr ""
+
+#: src/modules/mount/main.py:100
+msgid "Failed to import zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:116
+msgid "Failed to unlock zpool"
+msgstr ""
+
+#: src/modules/mount/main.py:133 src/modules/mount/main.py:138
+msgid "Failed to set zfs mountpoint"
+msgstr ""
+
+#: src/modules/mount/main.py:253
+msgid "zfs mounting error"
+msgstr ""
#: src/modules/rawfs/main.py:26
msgid "Installing data."
-msgstr "Installing data."
+msgstr ""
#: src/modules/dummypython/main.py:35
msgid "Dummy python job."
-msgstr "Dummy python job."
+msgstr ""
#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
#: src/modules/dummypython/main.py:94
msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+msgstr ""
#: src/modules/hwclock/main.py:26
msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
-
-#: src/modules/umount/main.py:31
-msgid "Unmount file systems."
-msgstr "Unmount file systems."
+msgstr ""
#: src/modules/openrcdmcryptcfg/main.py:26
msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+msgstr ""
#: src/modules/services-systemd/main.py:26
msgid "Configure systemd services"
-msgstr "Configure systemd services"
+msgstr ""
#: src/modules/services-systemd/main.py:60
msgid ""
"systemctl {arg!s} call in chroot returned error code {num!s}."
msgstr ""
-"systemctl {arg!s} call in chroot returned error code {num!s}."
#: src/modules/services-systemd/main.py:63
#: src/modules/services-systemd/main.py:69
msgid "Cannot enable systemd service {name!s}."
-msgstr "Cannot enable systemd service {name!s}."
+msgstr ""
#: src/modules/services-systemd/main.py:65
msgid "Cannot enable systemd target {name!s}."
-msgstr "Cannot enable systemd target {name!s}."
+msgstr ""
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd timer {name!s}."
-msgstr "Cannot enable systemd timer {name!s}."
+msgstr ""
#: src/modules/services-systemd/main.py:71
msgid "Cannot disable systemd target {name!s}."
-msgstr "Cannot disable systemd target {name!s}."
+msgstr ""
#: src/modules/services-systemd/main.py:73
msgid "Cannot mask systemd unit {name!s}."
-msgstr "Cannot mask systemd unit {name!s}."
+msgstr ""
#: src/modules/services-systemd/main.py:75
msgid ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
+"Unknown systemd commands {command!s} and {suffix!s} for unit {name!s}."
msgstr ""
-"Unknown systemd commands {command!s} and "
-"{suffix!s} for unit {name!s}."
#: src/modules/mkinitfs/main.py:27
msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+msgstr ""
#: src/modules/mkinitfs/main.py:49
msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+msgstr ""
#: src/modules/unpackfs/main.py:34
msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+msgstr ""
#: src/modules/unpackfs/main.py:254
msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+msgstr ""
#: src/modules/unpackfs/main.py:299
msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+msgstr ""
#: src/modules/unpackfs/main.py:314
msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+msgstr ""
-#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467
msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+msgstr ""
#: src/modules/unpackfs/main.py:430
msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+msgstr ""
#: src/modules/unpackfs/main.py:431
-msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgid "globalstorage does not contain a \"rootMountPoint\" key."
+msgstr ""
-#: src/modules/unpackfs/main.py:436
+#: src/modules/unpackfs/main.py:434
msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+msgstr ""
-#: src/modules/unpackfs/main.py:437
-msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+#: src/modules/unpackfs/main.py:435
+msgid "rootMountPoint is \"{}\", which does not exist."
+msgstr ""
-#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
-#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
-msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+#: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455
+#: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465
+#: src/modules/unpackfs/main.py:480
+msgid "Bad unpackfs configuration"
+msgstr ""
-#: src/modules/unpackfs/main.py:454
+#: src/modules/unpackfs/main.py:440
+msgid "There is no configuration information."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:456
msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
-#: src/modules/unpackfs/main.py:458
+#: src/modules/unpackfs/main.py:460
msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+msgstr ""
-#: src/modules/unpackfs/main.py:464
+#: src/modules/unpackfs/main.py:466
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed."
msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed."
-#: src/modules/unpackfs/main.py:479
+#: src/modules/unpackfs/main.py:481
msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
-
-#: src/modules/luksopenswaphookcfg/main.py:26
-msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+msgstr ""
diff --git a/lang/python/cs_CZ/LC_MESSAGES/python.po b/lang/python/cs_CZ/LC_MESSAGES/python.po
index 70e9d5b77..23737551a 100644
--- a/lang/python/cs_CZ/LC_MESSAGES/python.po
+++ b/lang/python/cs_CZ/LC_MESSAGES/python.po
@@ -6,7 +6,7 @@
# Translators:
# pavelrz, 2017
# LiberteCzech , 2020
-# Pavel Borecki , 2021
+# Pavel Borecki , 2022
#
#, fuzzy
msgid ""
@@ -15,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-02 15:45+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Pavel Borecki , 2021\n"
+"Last-Translator: Pavel Borecki , 2022\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/calamares/teams/20061/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -331,7 +331,7 @@ msgstr "Nedaří se zapnout systemd službu {name!s}."
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
+msgstr "Nedaří se zapnout systemd časovač {name!s}."
#: src/modules/services-systemd/main.py:71
msgid "Cannot disable systemd target {name!s}."
@@ -413,6 +413,8 @@ msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed."
msgstr ""
+"Nepodařilo se nalézt nástroj unsquashfs – ověřte, že je nainstalovaný "
+"balíček squashfs-tools."
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po
index 34fcd2d7a..c2d93d0f8 100644
--- a/lang/python/en_GB/LC_MESSAGES/python.po
+++ b/lang/python/en_GB/LC_MESSAGES/python.po
@@ -5,6 +5,7 @@
#
# Translators:
# Jason Collins , 2018
+# Karthik Balan, 2021
#
#, fuzzy
msgid ""
@@ -13,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-02 15:45+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Jason Collins , 2018\n"
+"Last-Translator: Karthik Balan, 2021\n"
"Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90
msgid "Configuration Error"
-msgstr ""
+msgstr "Configuration Error "
#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
@@ -61,7 +62,7 @@ msgstr ""
#: src/modules/bootloader/main.py:508
msgid "Bootloader installation error"
-msgstr ""
+msgstr "Bootloader installation error"
#: src/modules/bootloader/main.py:509
msgid ""
@@ -91,7 +92,7 @@ msgstr ""
#: src/modules/displaymanager/main.py:526
msgid "Cannot write KDM configuration file"
-msgstr ""
+msgstr "Cannot write KDM configuration file"
#: src/modules/displaymanager/main.py:527
msgid "KDM config file {!s} does not exist"
@@ -145,7 +146,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:29
msgid "Configure OpenRC services"
-msgstr ""
+msgstr "Configure OpenRC services"
#: src/modules/services-openrc/main.py:57
msgid "Cannot add service {name!s} to run-level {level!s}."
@@ -173,7 +174,7 @@ msgstr ""
#: src/modules/services-openrc/main.py:101
msgid "Target runlevel does not exist"
-msgstr ""
+msgstr "Target runlevel does not exist"
#: src/modules/services-openrc/main.py:102
msgid ""
@@ -193,7 +194,7 @@ msgstr ""
#: src/modules/networkcfg/main.py:29
msgid "Saving network configuration."
-msgstr ""
+msgstr "Saving network configuration "
#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
#: src/modules/packages/main.py:69
@@ -222,7 +223,7 @@ msgstr[1] "Removing %(num)d packages."
#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
#: src/modules/packages/main.py:678
msgid "Package Manager error"
-msgstr ""
+msgstr "Package Manager error"
#: src/modules/packages/main.py:639
msgid ""
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index c80f08842..00914664c 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -319,7 +319,7 @@ msgstr "systemd लक्ष्य {name!s}सक्रिय क
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
+msgstr "systemd टाइमर {name!s}सक्रिय करना विफल।"
#: src/modules/services-systemd/main.py:71
msgid "Cannot disable systemd target {name!s}."
@@ -399,6 +399,8 @@ msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed."
msgstr ""
+"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल "
+"है।"
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
diff --git a/lang/python/ja-Hira/LC_MESSAGES/python.po b/lang/python/ja-Hira/LC_MESSAGES/python.po
new file mode 100644
index 000000000..9a869c5bc
--- /dev/null
+++ b/lang/python/ja-Hira/LC_MESSAGES/python.po
@@ -0,0 +1,385 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Japanese (Hiragana) (https://www.transifex.com/calamares/teams/20061/ja-Hira/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ja-Hira\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for {!s} to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for {!s} to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"{!s} returned error code {!s}."
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No {!s} configuration is given for {!s} to use."
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command {!s} "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command {!s}"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command {!s} returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po
index ea9756e2b..7d4100a03 100644
--- a/lang/python/pl/LC_MESSAGES/python.po
+++ b/lang/python/pl/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
# FIRST AUTHOR , YEAR.
#
# Translators:
-# Marcin Mikołajczak , 2017
+# marcin mikołajczak , 2017
# KagiSame, 2018
# Piotr Strębski , 2020
# Jacob B. , 2021
diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po
index ab6e35e7f..91be0dd5a 100644
--- a/lang/python/ro/LC_MESSAGES/python.po
+++ b/lang/python/ro/LC_MESSAGES/python.po
@@ -6,6 +6,7 @@
# Translators:
# Jobava Jobava , 2018
# Sebastian Brici , 2018
+# Chele Ion , 2021
#
#, fuzzy
msgid ""
@@ -14,7 +15,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-02 15:45+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Sebastian Brici , 2018\n"
+"Last-Translator: Chele Ion , 2021\n"
"Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +25,7 @@ msgstr ""
#: src/modules/initramfscfg/main.py:32
msgid "Configuring initramfs."
-msgstr ""
+msgstr "Configurare initramfs"
#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
@@ -36,21 +37,21 @@ msgstr ""
#: src/modules/luksopenswaphookcfg/main.py:86
#: src/modules/luksopenswaphookcfg/main.py:90
msgid "Configuration Error"
-msgstr ""
+msgstr "Eroare de configurare"
#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
#: src/modules/luksopenswaphookcfg/main.py:87
msgid "No partitions are defined for {!s} to use."
-msgstr ""
+msgstr "Nu sunt partiţii definite ca 1{!s}1 ."
#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
#: src/modules/luksopenswaphookcfg/main.py:91
msgid "No root mount point is given for {!s} to use."
-msgstr ""
+msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ."
#: src/modules/grubcfg/main.py:28
msgid "Configure GRUB."
diff --git a/lang/python/ta_IN/LC_MESSAGES/python.po b/lang/python/ta_IN/LC_MESSAGES/python.po
new file mode 100644
index 000000000..666703faf
--- /dev/null
+++ b/lang/python/ta_IN/LC_MESSAGES/python.po
@@ -0,0 +1,387 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-11-02 15:45+0100\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Language-Team: Tamil (India) (https://www.transifex.com/calamares/teams/20061/ta_IN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ta_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105
+#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231
+#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144
+#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72
+#: src/modules/openrcdmcryptcfg/main.py:76
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90
+msgid "Configuration Error"
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356
+#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145
+#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73
+#: src/modules/luksopenswaphookcfg/main.py:87
+msgid "No partitions are defined for {!s} to use."
+msgstr ""
+
+#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362
+#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232
+#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77
+#: src/modules/luksopenswaphookcfg/main.py:91
+msgid "No root mount point is given for {!s} to use."
+msgstr ""
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr ""
+
+#: src/modules/bootloader/main.py:43
+msgid "Install bootloader."
+msgstr ""
+
+#: src/modules/bootloader/main.py:508
+msgid "Bootloader installation error"
+msgstr ""
+
+#: src/modules/bootloader/main.py:509
+msgid ""
+"The bootloader could not be installed. The installation command "
+"{!s} returned error code {!s}."
+msgstr ""
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr ""
+
+#: src/modules/fstab/main.py:389
+msgid "No {!s} configuration is given for {!s} to use."
+msgstr ""
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr ""
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr ""
+
+#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
+msgid "The exit code was {}"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:526
+msgid "Cannot write KDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:527
+msgid "KDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:588
+msgid "Cannot write LXDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:589
+msgid "LXDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:672
+msgid "Cannot write LightDM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:673
+msgid "LightDM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:747
+msgid "Cannot configure LightDM"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:748
+msgid "No LightDM greeter installed."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:779
+msgid "Cannot write SLIM configuration file"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:780
+msgid "SLIM config file {!s} does not exist"
+msgstr ""
+
+#: src/modules/displaymanager/main.py:906
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:907
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+
+#: src/modules/displaymanager/main.py:989
+msgid "Display manager configuration was incomplete"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action {arg!s} for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:93
+#: src/modules/services-systemd/main.py:59
+msgid "Cannot modify service"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"rc-update {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr ""
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is {path!s}, which does not "
+"exist."
+msgstr ""
+
+#: src/modules/networkcfg/main.py:29
+msgid "Saving network configuration."
+msgstr ""
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr ""
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr ""
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/modules/packages/main.py:638 src/modules/packages/main.py:650
+#: src/modules/packages/main.py:678
+msgid "Package Manager error"
+msgstr ""
+
+#: src/modules/packages/main.py:639
+msgid ""
+"The package manager could not prepare updates. The command {!s} "
+"returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:651
+msgid ""
+"The package manager could not update the system. The command {!s}"
+" returned error code {!s}."
+msgstr ""
+
+#: src/modules/packages/main.py:679
+msgid ""
+"The package manager could not make changes to the installed system. The "
+"command {!s} returned error code {!s}."
+msgstr ""
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr ""
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr ""
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr ""
+
+#: src/modules/mount/main.py:30
+msgid "Mounting partitions."
+msgstr ""
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr ""
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr ""
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr ""
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr ""
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr ""
+
+#: src/modules/openrcdmcryptcfg/main.py:26
+msgid "Configuring OpenRC dmcrypt service."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr ""
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"systemctl {arg!s} call in chroot returned error code {num!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot enable systemd service {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd timer {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot disable systemd target {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:73
+msgid "Cannot mask systemd unit {name!s}."
+msgstr ""
+
+#: src/modules/services-systemd/main.py:75
+msgid ""
+"Unknown systemd commands {command!s} and "
+"{suffix!s} for unit {name!s}."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr ""
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:34
+msgid "Filling up filesystems."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465
+msgid "Failed to unpack image \"{}\""
+msgstr ""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478
+msgid "Bad unsquash configuration"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr ""
+
+#: src/modules/unpackfs/main.py:464
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed."
+msgstr ""
+
+#: src/modules/unpackfs/main.py:479
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr ""
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr ""
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
index 900b99454..8948806ae 100644
--- a/lang/python/vi/LC_MESSAGES/python.po
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -5,7 +5,7 @@
#
# Translators:
# T. Tran , 2020
-# Th1nhhdk, 2021
+# th1nhhdk , 2021
#
#, fuzzy
msgid ""
@@ -14,7 +14,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-02 15:45+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Th1nhhdk, 2021\n"
+"Last-Translator: th1nhhdk , 2021\n"
"Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/zh_CN/LC_MESSAGES/python.po b/lang/python/zh_CN/LC_MESSAGES/python.po
index 706b02d24..c6972b0f5 100644
--- a/lang/python/zh_CN/LC_MESSAGES/python.po
+++ b/lang/python/zh_CN/LC_MESSAGES/python.po
@@ -9,6 +9,7 @@
# Feng Chao , 2020
# Bobby Rong , 2020
# 玉堂白鹤 , 2021
+# Giovanni Schiano-Moriello, 2022
#
#, fuzzy
msgid ""
@@ -17,7 +18,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-02 15:45+0100\n"
"PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: 玉堂白鹤 , 2021\n"
+"Last-Translator: Giovanni Schiano-Moriello, 2022\n"
"Language-Team: Chinese (China) (https://www.transifex.com/calamares/teams/20061/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -305,7 +306,7 @@ msgstr "无法启用 systemd 目标 {name!s}."
#: src/modules/services-systemd/main.py:67
msgid "Cannot enable systemd timer {name!s}."
-msgstr ""
+msgstr "无法启用 systemd 计时器 {name!s}。"
#: src/modules/services-systemd/main.py:71
msgid "Cannot disable systemd target {name!s}."
@@ -384,7 +385,7 @@ msgstr "源文件系统 \"{}\" 不存在"
msgid ""
"Failed to find unsquashfs, make sure you have the squashfs-tools package "
"installed."
-msgstr ""
+msgstr "寻找 unsquashfs 失败，请确定您已安装 squashfs-tools 软体包。"
#: src/modules/unpackfs/main.py:479
msgid "The destination \"{}\" in the target system is not a directory"
diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 9d0189031..ecbf77888 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -485,7 +485,7 @@ main( int argc, char* argv[] )
return 1;
}
- cDebug() << Logger::SubEntry << " .. got" << m->name() << m->typeString() << m->interfaceString();
+ cDebug() << Logger::SubEntry << "got" << m->name() << m->typeString() << m->interfaceString();
if ( m->type() == Calamares::Module::Type::View )
{
// If we forgot the --ui, any ViewModule will core dump as it
@@ -535,7 +535,7 @@ main( int argc, char* argv[] )
using TR = Logger::DebugRow< const char*, const QString >;
- cDebug() << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() )
+ cDebug() << Logger::SubEntry << "Module metadata" << TR( "name", m->name() ) << TR( "type", m->typeString() )
<< TR( "interface", m->interfaceString() );
Calamares::JobList jobList = m->jobs();
@@ -543,6 +543,8 @@ main( int argc, char* argv[] )
unsigned int count = 1;
for ( const auto& p : jobList )
{
+ // This doesn't get a SubEntry because the jobs may log a bunch of
+ // things; print the function-header to make clear that we're back in main.
cDebug() << "Job #" << count << "name" << p->prettyName();
Calamares::JobResult r = p->exec();
if ( !r )
diff --git a/src/libcalamares/Job.h b/src/libcalamares/Job.h
index 33965e15f..dc89f1c49 100644
--- a/src/libcalamares/Job.h
+++ b/src/libcalamares/Job.h
@@ -47,7 +47,7 @@ public:
/** @brief Is this JobResult a success?
*
- * Equivalent to errorCode() == 0, might be named isValid().
+ * Equivalent to errorCode() == 0, see succeeded().
*/
virtual operator bool() const;
@@ -58,6 +58,11 @@ public:
virtual void setDetails( const QString& details );
int errorCode() const { return m_number; }
+ /** @brief Is this JobResult a success?
+ *
+ * Equivalent to errorCode() == 0.
+ */
+ bool succeeded() const { return this->operator bool(); }
/// @brief an "ok status" result
static JobResult ok();
diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index 039a28e26..d7078c6d2 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -122,8 +122,9 @@ public:
}
else
{
- cDebug() << o << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" ) << jobitem.job->prettyName()
- << '(' << ( m_jobIndex + 1 ) << '/' << m_runningJobs->count() << ')';
+ cDebug() << o << "Starting" << ( failureEncountered ? "EMERGENCY JOB" : "job" )
+ << jobitem.job->prettyName() << '(' << ( m_jobIndex + 1 ) << '/' << m_runningJobs->count()
+ << ')';
o.refresh(); // So next time it shows the function header again
emitProgress( 0.0 ); // 0% for *this job*
connect( jobitem.job.data(), &Job::progress, this, &JobThread::emitProgress );
diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp
index d6e61b3aa..ca004ab5f 100644
--- a/src/libcalamares/PythonHelper.cpp
+++ b/src/libcalamares/PythonHelper.cpp
@@ -26,6 +26,11 @@ namespace CalamaresPython
boost::python::object
variantToPyObject( const QVariant& variant )
{
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch-enum"
+#endif
+ // 49 enumeration values not handled
switch ( variant.type() )
{
case QVariant::Map:
@@ -62,6 +67,9 @@ variantToPyObject( const QVariant& variant )
default:
return bp::object();
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index 291adbc54..ec17c31f3 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -23,6 +23,11 @@ static const char* s_preScript = nullptr;
namespace bp = boost::python;
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
+#endif
+
BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 );
BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_str_overloads, CalamaresPython::target_env_call, 1, 3 );
BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_list_overloads, CalamaresPython::target_env_call, 1, 3 );
@@ -42,6 +47,10 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_process_output_overloads,
4 );
BOOST_PYTHON_FUNCTION_OVERLOADS( host_env_process_output_overloads, CalamaresPython::host_env_process_output, 1, 4 );
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
BOOST_PYTHON_MODULE( libcalamares )
{
bp::object package = bp::scope();
@@ -91,7 +100,7 @@ BOOST_PYTHON_MODULE( libcalamares )
bp::args( "s" ),
"Writes the given string to the Calamares warning stream." );
bp::def(
- "error", &CalamaresPython::warning, bp::args( "s" ), "Writes the given string to the Calamares error stream." );
+ "error", &CalamaresPython::error, bp::args( "s" ), "Writes the given string to the Calamares error stream." );
// .. YAML functions
diff --git a/src/libcalamares/partition/FileSystem.cpp b/src/libcalamares/partition/FileSystem.cpp
index ad4df31ed..0dcd6fd32 100644
--- a/src/libcalamares/partition/FileSystem.cpp
+++ b/src/libcalamares/partition/FileSystem.cpp
@@ -22,6 +22,11 @@ namespace Partition
QString
prettyNameForFileSystemType( FileSystem::Type t )
{
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch-enum"
+#endif
+ // 13 enumeration values not handled
switch ( t )
{
case FileSystem::Unknown:
@@ -60,11 +65,19 @@ prettyNameForFileSystemType( FileSystem::Type t )
default:
return FileSystem::nameForType( t );
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
QString
untranslatedFS( FileSystem::Type t )
{
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wswitch-enum"
+#endif
+ // 34 enumeration values not handled
switch ( t )
{
case FileSystem::Type::ReiserFS:
@@ -72,6 +85,9 @@ untranslatedFS( FileSystem::Type t )
default:
return FileSystem::nameForType( t, { QStringLiteral( "C" ) } );
}
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
}
} // namespace Partition
diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp
index 89e17a885..6bc3a7cd2 100644
--- a/src/libcalamares/partition/Mount.cpp
+++ b/src/libcalamares/partition/Mount.cpp
@@ -14,6 +14,7 @@
#include "partition/Sync.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
+#include "utils/String.h"
#include
#include
@@ -92,7 +93,7 @@ struct TemporaryMount::Private
TemporaryMount::TemporaryMount( const QString& devicePath, const QString& filesystemName, const QString& options )
- : m_d( std::make_unique() )
+ : m_d( std::make_unique< Private >() )
{
m_d->m_devicePath = devicePath;
m_d->m_mountDir.setAutoRemove( false );
@@ -123,5 +124,32 @@ TemporaryMount::path() const
return m_d ? m_d->m_mountDir.path() : QString();
}
+QList< MtabInfo >
+MtabInfo::fromMtabFilteredByPrefix( const QString& mountPrefix, const QString& mtabPath )
+{
+ QFile f( mtabPath.isEmpty() ? "/etc/mtab" : mtabPath );
+ if ( !f.open( QIODevice::ReadOnly ) )
+ {
+ return {};
+ }
+
+ QTextStream in( &f );
+ QList< MtabInfo > l;
+ while ( !f.atEnd() )
+ {
+ QStringList line = in.readLine().split( ' ', SplitSkipEmptyParts );
+ if ( line.length() == 3 && !line[ 0 ].startsWith( '#' ) )
+ {
+ // Lines have format: , so check
+ // the mountpoint field. Everything starts with an empty string.
+ if ( line[ 1 ].startsWith( mountPrefix ) )
+ {
+ l.append( { line[ 0 ], line[ 1 ] } );
+ }
+ }
+ }
+ return l;
+}
+
} // namespace Partition
} // namespace CalamaresUtils
diff --git a/src/libcalamares/partition/Mount.h b/src/libcalamares/partition/Mount.h
index d088b108f..f772c33a4 100644
--- a/src/libcalamares/partition/Mount.h
+++ b/src/libcalamares/partition/Mount.h
@@ -14,6 +14,7 @@
#include "DllMacro.h"
+#include
#include
#include
@@ -50,6 +51,13 @@ DLLEXPORT int mount( const QString& devicePath,
*/
DLLEXPORT int unmount( const QString& path, const QStringList& options = QStringList() );
+
+/** @brief Mount and automatically unmount a device
+ *
+ * The TemporaryMount object mounts a filesystem, and is like calling
+ * the mount() function, above. When the object is destroyed, unmount()
+ * is called with suitable options to undo the original mount.
+ */
class DLLEXPORT TemporaryMount
{
public:
@@ -68,6 +76,36 @@ private:
std::unique_ptr< Private > m_d;
};
+
+/** @brief Information about a mount point from /etc/mtab
+ *
+ * Entries in /etc/mtab are of the form:
+ * This struct only stores device and mountpoint.
+ *
+ * The main way of getting these structs is to call fromMtab() to read
+ * an /etc/mtab-like file and storing all of the entries from it.
+ */
+struct DLLEXPORT MtabInfo
+{
+ QString device;
+ QString mountPoint;
+
+ /** @brief Reads an mtab-like file and returns the entries from it
+ *
+ * When @p mtabPath is given, that file is read. If the given name is
+ * empty (e.g. the default) then /etc/mtab is read, instead.
+ *
+ * If @p mountPrefix is given, then only entries that have a mount point
+ * that starts with that prefix are returned.
+ */
+ static QList< MtabInfo > fromMtabFilteredByPrefix( const QString& mountPrefix = QString(),
+ const QString& mtabPath = QString() );
+ /// @brief Predicate to sort MtabInfo objects by device-name
+ static bool deviceOrder( const MtabInfo& a, const MtabInfo& b ) { return a.device > b.device; }
+ /// @brief Predicate to sort MtabInfo objects by mount-point
+ static bool mountPointOrder( const MtabInfo& a, const MtabInfo& b ) { return a.mountPoint > b.mountPoint; }
+};
+
} // namespace Partition
} // namespace CalamaresUtils
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
index b290b62c5..9a4ba990f 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp
@@ -115,12 +115,14 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write
QString completePath = targetPath( path );
if ( completePath.isEmpty() )
{
+ cWarning() << "No target path for" << path;
return CreationResult( CreationResult::Code::Invalid );
}
QFile f( completePath );
if ( ( mode == WriteMode::KeepExisting ) && f.exists() )
{
+ cWarning() << "Target file" << completePath << "already exists";
return CreationResult( CreationResult::Code::AlreadyExists );
}
@@ -133,13 +135,16 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write
if ( !f.open( m ) )
{
+ cWarning() << "Could not open target file" << completePath;
return CreationResult( CreationResult::Code::Failed );
}
- if ( f.write( contents ) != contents.size() )
+ auto written = f.write( contents );
+ if ( written != contents.size() )
{
f.close();
f.remove();
+ cWarning() << "Short write (" << written << "out of" << contents.size() << "bytes) to" << completePath;
return CreationResult( CreationResult::Code::Failed );
}
@@ -147,6 +152,30 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write
return CreationResult( QFileInfo( f ).canonicalFilePath() );
}
+QStringList
+System::readTargetFile( const QString& path ) const
+{
+ const QString completePath = targetPath( path );
+ if ( completePath.isEmpty() )
+ {
+ return QStringList();
+ }
+
+ QFile f( completePath );
+ if ( !f.open( QIODevice::ReadOnly ) )
+ {
+ return QStringList();
+ }
+
+ QTextStream in( &f );
+ QStringList l;
+ while ( !f.atEnd() )
+ {
+ l << in.readLine();
+ }
+ return l;
+}
+
void
System::removeTargetFile( const QString& path ) const
{
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h
index e11ecae05..1bb5629d1 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.h
+++ b/src/libcalamares/utils/CalamaresUtilsSystem.h
@@ -287,6 +287,24 @@ public:
*/
DLLEXPORT void removeTargetFile( const QString& path ) const;
+ /** @brief Reads a file from the target system.
+ *
+ * @param path Path to the file; this is interpreted from the root of
+ * the target system (@see targetPath()).
+ *
+ * Does no error checking, and returns an empty list if the file does
+ * not exist.
+ *
+ * NOTE: This function is now basically the same as QFile::readAll(),
+ * splitting into lines, but Calamares may need to change
+ * permissions or raise privileges to actually read the file,
+ * which is why there is an API.
+ *
+ * NOTE: Since this buffers the whole file in memory, reading big files
+ * is not recommended.
+ */
+ DLLEXPORT QStringList readTargetFile( const QString& path ) const;
+
/** @brief Ensure that the directory @p path exists
*
* @param path a full pathname to a desired directory.
diff --git a/src/libcalamares/utils/Logger.cpp b/src/libcalamares/utils/Logger.cpp
index d35d6891b..adb082687 100644
--- a/src/libcalamares/utils/Logger.cpp
+++ b/src/libcalamares/utils/Logger.cpp
@@ -259,21 +259,22 @@ operator<<( QDebug& s, const RedactedCommand& l )
* Identical strings with the same context will be hashed the same,
* so that they can be logged and still recognized as the-same.
*/
-static uint insertRedactedName( const QString& context, const QString& s )
+static uint
+insertRedactedName( const QString& context, const QString& s )
{
static uint salt = QRandomGenerator::global()->generate(); // Just once
- uint val = qHash(context, salt);
- return qHash(s, val);
+ uint val = qHash( context, salt );
+ return qHash( s, val );
}
RedactedName::RedactedName( const QString& context, const QString& s )
- : m_id( insertRedactedName(context, s) ),
- m_context(context)
+ : m_id( insertRedactedName( context, s ) )
+ , m_context( context )
{
}
-RedactedName::RedactedName(const char *context, const QString& s )
+RedactedName::RedactedName( const char* context, const QString& s )
: RedactedName( QString::fromLatin1( context ), s )
{
}
diff --git a/src/libcalamares/utils/Logger.h b/src/libcalamares/utils/Logger.h
index 0d7d5c870..f4079388d 100644
--- a/src/libcalamares/utils/Logger.h
+++ b/src/libcalamares/utils/Logger.h
@@ -71,8 +71,11 @@ private:
inline CDebug&
operator<<( CDebug&& s, const FuncSuppressor& f )
{
- s.m_funcinfo = nullptr;
- s << f.m_s;
+ if ( s.m_funcinfo )
+ {
+ s.m_funcinfo = nullptr;
+ s.m_msg = QString( f.m_s );
+ }
return s;
}
@@ -244,7 +247,8 @@ private:
const QString m_context;
};
-inline QDebug& operator<<( QDebug& s, const RedactedName& n )
+inline QDebug&
+operator<<( QDebug& s, const RedactedName& n )
{
return s << NoQuote << QString( n ) << Quote;
}
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index efe12ef8a..8bb044983 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -29,7 +29,8 @@ namespace CalamaresUtils
* @param locale the new locale (names as defined by Calamares).
* @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
*/
-DLLEXPORT void installTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& brandingTranslationsPrefix );
+DLLEXPORT void installTranslator( const CalamaresUtils::Locale::Translation::Id& locale,
+ const QString& brandingTranslationsPrefix );
/** @brief Initializes the translations with the current system settings
*/
@@ -56,7 +57,8 @@ DLLEXPORT CalamaresUtils::Locale::Translation::Id translatorLocaleName();
*
* @returns @c true on success
*/
-DLLEXPORT bool loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator );
+DLLEXPORT bool
+loadTranslator( const CalamaresUtils::Locale::Translation::Id& locale, const QString& prefix, QTranslator* translator );
/** @brief Set @p allow to true to load translations from current dir.
*
@@ -88,7 +90,7 @@ public:
static Retranslator* instance();
/// @brief Helper function for attaching lambdas
- static void attach( QObject* o, std::function< void( void ) > f);
+ static void attach( QObject* o, std::function< void( void ) > f );
signals:
void languageChanged();
@@ -138,8 +140,11 @@ private:
#define CALAMARES_RETRANSLATE_SLOT( slotfunc ) \
do \
{ \
- connect( CalamaresUtils::Retranslator::instance(), &CalamaresUtils::Retranslator::languageChanged, this, slotfunc ); \
- (this->*slotfunc)(); \
+ connect( CalamaresUtils::Retranslator::instance(), \
+ &CalamaresUtils::Retranslator::languageChanged, \
+ this, \
+ slotfunc ); \
+ ( this->*slotfunc )(); \
} while ( false )
#endif
diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp
index 615d30309..c88c23693 100644
--- a/src/libcalamares/utils/String.cpp
+++ b/src/libcalamares/utils/String.cpp
@@ -224,5 +224,26 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C
return front + back.right( chars.total / 2 );
}
+void
+removeLeading( QString& string, QChar c )
+{
+ int count = 0;
+ while ( string.length() > count && string[ count ] == c )
+ {
+ count++;
+ }
+ string.remove( 0, count );
+}
+
+void
+removeTrailing( QString& string, QChar c )
+{
+ int lastIndex = string.length();
+ while ( lastIndex > 0 && string[ lastIndex - 1 ] == c )
+ {
+ lastIndex--;
+ }
+ string.remove( lastIndex, string.length() );
+}
} // namespace CalamaresUtils
diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h
index e08255f86..1adc2336a 100644
--- a/src/libcalamares/utils/String.h
+++ b/src/libcalamares/utils/String.h
@@ -100,6 +100,19 @@ DLLEXPORT QString truncateMultiLine( const QString& string,
LinesStartEnd lines = LinesStartEnd { 3, 5 },
CharCount chars = CharCount { 812 } );
+/** @brief Remove all @p c at the beginning of @p string
+ *
+ * Modifies the @p string in-place. If @p c is not the first character
+ * of @p string, the string is left unchanged; otherwise the first character
+ * is removed and the process repeats.
+ */
+DLLEXPORT void removeLeading( QString& string, QChar c );
+/** @brief Remove all @p c at the end of @p string
+ *
+ * Like removeLeading(), but at the end of the string.
+ */
+DLLEXPORT void removeTrailing( QString& string, QChar c );
+
} // namespace CalamaresUtils
#endif
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index 12b72cb4c..3dde75338 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -70,12 +70,19 @@ private Q_SLOTS:
void testStringTruncation();
void testStringTruncationShorter();
void testStringTruncationDegenerate();
+ void testStringRemoveLeading_data();
+ void testStringRemoveLeading();
+ void testStringRemoveTrailing_data();
+ void testStringRemoveTrailing();
/** @section Test Runner directory-manipulation. */
void testRunnerDirs();
void testCalculateWorkingDirectory();
void testRunnerOutput();
+ /** @section Test file-functions */
+ void testReadWriteFile();
+
private:
void recursiveCompareMap( const QVariantMap& a, const QVariantMap& b, int depth );
};
@@ -751,6 +758,64 @@ LibCalamaresTests::testStringTruncationDegenerate()
}
}
+void
+LibCalamaresTests::testStringRemoveLeading_data()
+{
+ QTest::addColumn< QString >( "string" );
+ QTest::addColumn< char >( "c" );
+ QTest::addColumn< QString >( "result" );
+
+ QTest::newRow( "empty" ) << QString() << '/' << QString();
+ QTest::newRow( "one-slash" ) << QStringLiteral( "/tmp" ) << '/' << QStringLiteral( "tmp" );
+ QTest::newRow( "two-slash" ) << QStringLiteral( "//tmp" ) << '/' << QStringLiteral( "tmp" );
+ QTest::newRow( "multi-slash" ) << QStringLiteral( "/tmp/p" ) << '/' << QStringLiteral( "tmp/p" );
+ QTest::newRow( "later-slash" ) << QStringLiteral( "@/tmp" ) << '/' << QStringLiteral( "@/tmp" );
+ QTest::newRow( "all-one-slash" ) << QStringLiteral( "/" ) << '/' << QString();
+ QTest::newRow( "all-many-slash" ) << QStringLiteral( "////////////////////" ) << '/' << QString();
+ QTest::newRow( "trailing" ) << QStringLiteral( "tmp/" ) << '/' << QStringLiteral( "tmp/" );
+}
+
+void
+LibCalamaresTests::testStringRemoveLeading()
+{
+ QFETCH( QString, string );
+ QFETCH( char, c );
+ QFETCH( QString, result );
+
+ const QString initial = string;
+ CalamaresUtils::removeLeading( string, c );
+ QCOMPARE( string, result );
+}
+
+void
+LibCalamaresTests::testStringRemoveTrailing_data()
+{
+ QTest::addColumn< QString >( "string" );
+ QTest::addColumn< char >( "c" );
+ QTest::addColumn< QString >( "result" );
+
+ QTest::newRow( "empty" ) << QString() << '/' << QString();
+ QTest::newRow( "one-slash" ) << QStringLiteral( "/tmp" ) << '/' << QStringLiteral( "/tmp" );
+ QTest::newRow( "two-slash" ) << QStringLiteral( "//tmp" ) << '/' << QStringLiteral( "//tmp" );
+ QTest::newRow( "multi-slash" ) << QStringLiteral( "/tmp//p/" ) << '/' << QStringLiteral( "/tmp//p" );
+ QTest::newRow( "later-slash" ) << QStringLiteral( "@/tmp/@" ) << '/' << QStringLiteral( "@/tmp/@" );
+ QTest::newRow( "later-slash2" ) << QStringLiteral( "@/tmp/@//" ) << '/' << QStringLiteral( "@/tmp/@" );
+ QTest::newRow( "all-one-slash" ) << QStringLiteral( "/" ) << '/' << QString();
+ QTest::newRow( "all-many-slash" ) << QStringLiteral( "////////////////////" ) << '/' << QString();
+ QTest::newRow( "trailing" ) << QStringLiteral( "tmp/" ) << '/' << QStringLiteral( "tmp" );
+}
+
+void
+LibCalamaresTests::testStringRemoveTrailing()
+{
+ QFETCH( QString, string );
+ QFETCH( char, c );
+ QFETCH( QString, result );
+
+ const QString initial = string;
+ CalamaresUtils::removeTrailing( string, c );
+ QCOMPARE( string, result );
+}
static QString
dirname( const QTemporaryDir& d )
@@ -950,6 +1015,84 @@ LibCalamaresTests::testRunnerOutput()
}
+CalamaresUtils::System*
+file_setup( const QTemporaryDir& tempRoot )
+{
+ CalamaresUtils::System* ss = CalamaresUtils::System::instance();
+ if ( !ss )
+ {
+ ss = new CalamaresUtils::System( true );
+ }
+
+ Calamares::GlobalStorage* gs
+ = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ if ( !gs )
+ {
+ cDebug() << "Creating new JobQueue";
+ (void)new Calamares::JobQueue();
+ gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ }
+ if ( gs )
+ {
+ // Working with a rootMountPoint set
+ gs->insert( "rootMountPoint", tempRoot.path() );
+ }
+ return ss;
+}
+
+void
+LibCalamaresTests::testReadWriteFile()
+{
+ static const QByteArray otherContents( "derp\n" );
+
+ QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) );
+ auto* ss = file_setup( tempRoot );
+
+ QVERIFY( ss );
+ {
+ auto fullPath = ss->createTargetFile( "test0", QByteArray(), CalamaresUtils::System::WriteMode::Overwrite );
+ QVERIFY( fullPath );
+ QVERIFY( !fullPath.path().isEmpty() );
+
+ QFileInfo fi( fullPath.path() );
+ QVERIFY( fi.exists() );
+ QVERIFY( fi.isFile() );
+ QCOMPARE( fi.size(), 0 );
+ }
+ // It won't overwrite unless you ask for it
+ {
+ auto fullPath = ss->createTargetFile( "test0", otherContents );
+ QVERIFY( !fullPath ); // Failed, because it won't overwrite
+ QCOMPARE( fullPath.code(), decltype( fullPath )::Code::AlreadyExists );
+ QVERIFY( fullPath.path().isEmpty() ); // Because it wasn't written
+
+ QFileInfo fi( tempRoot.filePath( "test0" ) ); // Compute the name some other way
+ QVERIFY( fi.exists() );
+ QVERIFY( fi.isFile() );
+ QCOMPARE( fi.size(), 0 );
+ }
+ // But it will if you say so explicitly
+ {
+ auto fullPath = ss->createTargetFile( "test0", otherContents, CalamaresUtils::System::WriteMode::Overwrite );
+ QVERIFY( fullPath );
+ QVERIFY( !fullPath.path().isEmpty() );
+
+ QFileInfo fi( fullPath.path() );
+ QVERIFY( fi.exists() );
+ QVERIFY( fi.isFile() );
+ QCOMPARE( fi.size(), 5 );
+ }
+
+ // Now it's been written, we can read it, too
+ {
+ auto contents = ss->readTargetFile( "test0" );
+ QVERIFY( !contents.isEmpty() );
+ QCOMPARE( contents.count(), 1 );
+ QCOMPARE( contents[ 0 ], QStringLiteral( "derp" ) ); // No trailing \n
+ }
+}
+
+
QTEST_GUILESS_MAIN( LibCalamaresTests )
#include "utils/moc-warnings.h"
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 5894c723d..b723f5dc7 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -162,14 +162,15 @@ uploadServerFromMap( const QVariantMap& map )
if ( typestring.isEmpty() || urlstring.isEmpty() )
{
- return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl(), 0 );
+ return Branding::UploadServerInfo { Branding::UploadServerType::None, QUrl(), 0 };
}
bool bogus = false; // we don't care about type-name lookup success here
- return Branding::UploadServerInfo(
+ return Branding::UploadServerInfo {
names.find( typestring, bogus ),
QUrl( urlstring, QUrl::ParsingMode::StrictMode ),
- sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1 );
+ sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1
+ };
}
/** @brief Load the @p map with strings from @p config
diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h
index ba49f87c3..899b14c78 100644
--- a/src/libcalamaresui/Branding.h
+++ b/src/libcalamaresui/Branding.h
@@ -227,7 +227,14 @@ public:
* is irrelevant and usually empty), the URL for the upload and the size limit of upload
* in bytes (for configuration value < 0, it serves -1, which stands for having no limit).
*/
- using UploadServerInfo = std::tuple< UploadServerType, QUrl, qint64 >;
+ struct UploadServerInfo
+ {
+ UploadServerType type;
+ QUrl url;
+ qint64 size;
+
+ operator bool() const { return type != Calamares::Branding::UploadServerType::None && size != 0; }
+ };
UploadServerInfo uploadServer() const { return m_uploadServer; }
/**
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index a704b7484..bd2e79f10 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -27,6 +27,7 @@ set( calamaresui_SOURCES
viewpages/ViewStep.cpp
widgets/ClickableLabel.cpp
+ widgets/ErrorDialog.cpp
widgets/FixedAspectRatioLabel.cpp
widgets/PrettyRadioButton.cpp
widgets/TranslationFix.cpp
@@ -39,8 +40,6 @@ set( calamaresui_SOURCES
# Don't warn about third-party sources
mark_thirdparty_code(
- ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp
- ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp
${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp
)
@@ -75,6 +74,8 @@ calamares_add_library( calamaresui
Qt5::Svg
RESOURCES libcalamaresui.qrc
EXPORT Calamares
+ UI
+ utils/ErrorDialog/ErrorDialog.ui
VERSION ${CALAMARES_VERSION_SHORT}
)
target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp )
diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp
index 57570ad64..44afafb15 100644
--- a/src/libcalamaresui/ViewManager.cpp
+++ b/src/libcalamaresui/ViewManager.cpp
@@ -24,11 +24,13 @@
#include "viewpages/BlankViewStep.h"
#include "viewpages/ExecutionViewStep.h"
#include "viewpages/ViewStep.h"
+#include "widgets/ErrorDialog.h"
#include "widgets/TranslationFix.h"
#include
#include
#include
+#include
#include
#include
#include
@@ -150,56 +152,32 @@ ViewManager::insertViewStep( int before, ViewStep* step )
void
ViewManager::onInstallationFailed( const QString& message, const QString& details )
{
- bool shouldOfferWebPaste = std::get< 0 >( Calamares::Branding::instance()->uploadServer() )
- != Calamares::Branding::UploadServerType::None
- and std::get< 2 >( Calamares::Branding::instance()->uploadServer() ) != 0;
-
cError() << "Installation failed:" << message;
cDebug() << Logger::SubEntry << "- message:" << message;
cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details;
QString heading
= Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" );
- QString pasteMsg = tr( "Would you like to paste the install log to the web?" );
- QString text = "" + message + "
";
- if ( !details.isEmpty() )
- {
- text += ""
- + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 6, 2 } )
- .replace( '\n', QStringLiteral( "
" ) )
- + "
";
- }
- if ( shouldOfferWebPaste )
- {
- text += "" + pasteMsg + "
";
- }
- QMessageBox* msgBox = new QMessageBox();
- msgBox->setIcon( QMessageBox::Critical );
- msgBox->setWindowTitle( tr( "Error" ) );
- msgBox->setText( "" + heading + "" );
- msgBox->setInformativeText( text );
- if ( shouldOfferWebPaste )
- {
- msgBox->setStandardButtons( QMessageBox::Yes | QMessageBox::No );
- msgBox->setDefaultButton( QMessageBox::No );
- }
- else
- {
- msgBox->setStandardButtons( QMessageBox::Close );
- msgBox->setDefaultButton( QMessageBox::Close );
- }
- Calamares::fixButtonLabels( msgBox );
- msgBox->show();
+ ErrorDialog* errorDialog = new ErrorDialog();
+ errorDialog->setWindowTitle( tr( "Error" ) );
+ errorDialog->setHeading( "" + heading + "" );
+ errorDialog->setInformativeText( message );
+ errorDialog->setShouldOfferWebPaste( Calamares::Branding::instance()->uploadServer() );
+ errorDialog->setDetails( details );
+ errorDialog->show();
cDebug() << "Calamares will quit when the dialog closes.";
- connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) {
- if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole )
- {
- CalamaresUtils::Paste::doLogUploadUI( msgBox );
- }
- QApplication::quit();
- } );
+ connect( errorDialog,
+ &QDialog::finished,
+ [ errorDialog ]( int result )
+ {
+ if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() )
+ {
+ CalamaresUtils::Paste::doLogUploadUI( errorDialog );
+ }
+ QApplication::quit();
+ } );
}
diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index 519dc0133..d782d138e 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -69,7 +69,8 @@ STATICTEST QString
ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent )
{
QTcpSocket* socket = new QTcpSocket( parent );
- socket->connectToHost( serverUrl.host(), serverUrl.port() );
+ // 16 bits of port-number
+ socket->connectToHost( serverUrl.host(), quint16( serverUrl.port() ) );
if ( !socket->waitForConnected() )
{
diff --git a/src/libcalamaresui/widgets/ErrorDialog.cpp b/src/libcalamaresui/widgets/ErrorDialog.cpp
new file mode 100644
index 000000000..8c682f964
--- /dev/null
+++ b/src/libcalamaresui/widgets/ErrorDialog.cpp
@@ -0,0 +1,106 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Artem Grinev
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "ErrorDialog.h"
+#include "ui_ErrorDialog.h"
+
+#include "widgets/TranslationFix.h"
+#include
+#include
+
+namespace Calamares
+{
+
+ErrorDialog::ErrorDialog( QWidget* parent )
+ : QDialog( parent )
+ , ui( new Ui::ErrorDialog )
+{
+ ui->setupUi( this );
+ ui->iconLabel->setPixmap( QIcon::fromTheme( "dialog-error" ).pixmap( 64 ) );
+ ui->detailsWidget->hide();
+ ui->offerWebPasteLabel->hide();
+}
+
+ErrorDialog::~ErrorDialog()
+{
+ delete ui;
+}
+
+QString
+ErrorDialog::heading() const
+{
+ return ui->headingLabel->text();
+}
+
+QString
+ErrorDialog::informativeText() const
+{
+ return ui->informativeTextLabel->text();
+}
+
+QString
+ErrorDialog::details() const
+{
+ return ui->detailsBrowser->toPlainText();
+}
+
+void
+ErrorDialog::setHeading( const QString& newHeading )
+{
+ if ( ui->headingLabel->text() != newHeading )
+ {
+ ui->headingLabel->setText( newHeading );
+ emit headingChanged();
+ }
+}
+
+void
+ErrorDialog::setInformativeText( const QString& newInformativeText )
+{
+ if ( ui->informativeTextLabel->text() != newInformativeText )
+ {
+ ui->informativeTextLabel->setText( newInformativeText );
+ emit informativeTextChanged();
+ }
+}
+
+void
+ErrorDialog::setDetails( const QString& newDetails )
+{
+ if ( ui->detailsBrowser->toPlainText() != newDetails )
+ {
+ ui->detailsBrowser->setPlainText( newDetails );
+ ui->detailsWidget->setVisible( !ui->detailsBrowser->toPlainText().trimmed().isEmpty() );
+ emit detailsChanged();
+ }
+}
+
+bool
+ErrorDialog::shouldOfferWebPaste() const
+{
+ return m_shouldOfferWebPaste;
+}
+
+void
+ErrorDialog::setShouldOfferWebPaste( bool newShouldOfferWebPaste )
+{
+ if ( m_shouldOfferWebPaste != newShouldOfferWebPaste )
+ {
+ m_shouldOfferWebPaste = newShouldOfferWebPaste;
+
+ ui->offerWebPasteLabel->setVisible( m_shouldOfferWebPaste );
+ ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? ( QDialogButtonBox::Yes | QDialogButtonBox::No )
+ : QDialogButtonBox::Close );
+ fixButtonLabels( ui->buttonBox );
+
+ emit shouldOfferWebPasteChanged();
+ }
+}
+
+} // namespace Calamares
diff --git a/src/libcalamaresui/widgets/ErrorDialog.h b/src/libcalamaresui/widgets/ErrorDialog.h
new file mode 100644
index 000000000..c4949a89c
--- /dev/null
+++ b/src/libcalamaresui/widgets/ErrorDialog.h
@@ -0,0 +1,83 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Artem Grinev
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef LIBCALAMARESUI_ERRORDIALOG_H
+#define LIBCALAMARESUI_ERRORDIALOG_H
+
+#include
+
+namespace Ui
+{
+class ErrorDialog;
+}
+
+namespace Calamares
+{
+class ErrorDialog : public QDialog
+{
+ Q_OBJECT
+
+ Q_PROPERTY( QString heading READ heading WRITE setHeading NOTIFY headingChanged )
+ Q_PROPERTY( QString informativeText READ informativeText WRITE setInformativeText NOTIFY informativeTextChanged )
+ Q_PROPERTY( QString details READ details WRITE setDetails NOTIFY detailsChanged )
+ Q_PROPERTY( bool shouldOfferWebPaste READ shouldOfferWebPaste WRITE setShouldOfferWebPaste NOTIFY
+ shouldOfferWebPasteChanged )
+
+public:
+ explicit ErrorDialog( QWidget* parent = nullptr );
+ ~ErrorDialog() override;
+
+ /** @brief The heading (title) of the error dialog
+ *
+ * This is a short (one-line) title. It is human-readable, so should
+ * be translated at the time it is set.
+ */
+ QString heading() const;
+ void setHeading( const QString& newHeading );
+
+ /** @brief The description of the problem
+ *
+ * Longer, human-readable, description of the problem. This text
+ * is word-wrapped as necessary.
+ */
+ QString informativeText() const;
+ void setInformativeText( const QString& newInformativeText );
+
+ /** @brief Details of the problem
+ *
+ * This is generally command-output; it might not be translated
+ * when set. It should be considered "background to the informative
+ * text", or maybe "the reasons". Write the informative text for
+ * the end-user.
+ */
+ QString details() const;
+ void setDetails( const QString& newDetails );
+
+ /** @brief Enable web-paste button
+ *
+ * The web-paste button can be configured at a global level,
+ * but each individual error dialog can be set separately.
+ */
+ bool shouldOfferWebPaste() const;
+ void setShouldOfferWebPaste( bool newShouldOfferWebPaste );
+
+signals:
+ void headingChanged();
+ void informativeTextChanged();
+ void detailsChanged();
+ void shouldOfferWebPasteChanged();
+
+private:
+ Ui::ErrorDialog* ui;
+ bool m_shouldOfferWebPaste = false;
+};
+
+}; // namespace Calamares
+
+#endif // LIBCALAMARESUI_ERRORDIALOG_H
diff --git a/src/libcalamaresui/widgets/ErrorDialog.ui b/src/libcalamaresui/widgets/ErrorDialog.ui
new file mode 100644
index 000000000..cb480034e
--- /dev/null
+++ b/src/libcalamaresui/widgets/ErrorDialog.ui
@@ -0,0 +1,133 @@
+
+
+ ErrorDialog
+
+
+
+ 0
+ 0
+ 425
+ 262
+
+
+
+ Dialog
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+ Details:
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ Would you like to paste the install log to the web?
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Close
+
+
+
+ -
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+ buttonBox
+ accepted()
+ ErrorDialog
+ accept()
+
+
+ 248
+ 254
+
+
+ 157
+ 274
+
+
+
+
+ buttonBox
+ rejected()
+ ErrorDialog
+ reject()
+
+
+ 316
+ 260
+
+
+ 286
+ 274
+
+
+
+
+
diff --git a/src/libcalamaresui/widgets/TranslationFix.cpp b/src/libcalamaresui/widgets/TranslationFix.cpp
index 1262fceb5..dbfd0bd83 100644
--- a/src/libcalamaresui/widgets/TranslationFix.cpp
+++ b/src/libcalamaresui/widgets/TranslationFix.cpp
@@ -11,30 +11,34 @@
#include
#include
+#include
#include
+#include
namespace Calamares
{
+//Using QMessageBox's StandardButton enum here but according to headers they should be kept in-sync between multiple classes.
+static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = {
+ { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) },
+ { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) },
+ { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) },
+ { QMessageBox::Cancel, QT_TRANSLATE_NOOP( "StandardButtons", "&Cancel" ) },
+ { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) },
+};
+
+template < typename TButtonBox >
void
-fixButtonLabels( QMessageBox* box )
+fixButtonLabels( TButtonBox* box )
{
if ( !box )
{
return;
}
- static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = {
- { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) },
- { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) },
- { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) },
- { QMessageBox::Cancel, QT_TRANSLATE_NOOP( "StandardButtons", "&Cancel" ) },
- { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) },
- };
-
for ( auto [ sb, label ] : maps )
{
- auto* button = box->button( sb );
+ auto* button = box->button( static_cast< typename TButtonBox::StandardButton >( int( sb ) ) );
if ( button )
{
button->setText( QCoreApplication::translate( "StandardButtons", label ) );
@@ -42,4 +46,16 @@ fixButtonLabels( QMessageBox* box )
}
}
+void
+fixButtonLabels( QMessageBox* box )
+{
+ fixButtonLabels< QMessageBox >( box );
+}
+
+void
+fixButtonLabels( QDialogButtonBox* box )
+{
+ fixButtonLabels< QDialogButtonBox >( box );
+}
+
} // namespace Calamares
diff --git a/src/libcalamaresui/widgets/TranslationFix.h b/src/libcalamaresui/widgets/TranslationFix.h
index 107dad67d..89ee9a51a 100644
--- a/src/libcalamaresui/widgets/TranslationFix.h
+++ b/src/libcalamaresui/widgets/TranslationFix.h
@@ -13,6 +13,7 @@
#include "DllMacro.h"
class QMessageBox;
+class QDialogButtonBox;
namespace Calamares
{
@@ -26,6 +27,8 @@ namespace Calamares
* guess the context.
*/
void UIDLLEXPORT fixButtonLabels( QMessageBox* );
+
+void UIDLLEXPORT fixButtonLabels( QDialogButtonBox* );
} // namespace Calamares
#endif
diff --git a/src/modules/README.md b/src/modules/README.md
index 7b4d4b3a3..62d92c260 100644
--- a/src/modules/README.md
+++ b/src/modules/README.md
@@ -67,7 +67,7 @@ Note that process modules are not recommended.
Module descriptors **may** have the following keys:
- *emergency* (a boolean value, set to true to mark the module
- as an emergency module)
+ as an emergency module; see the section *Emergency Modules*, below)
- *noconfig* (a boolean value, set to true to state that the module
has no configuration file; defaults to false)
- *requiredModules* (a list of modules which are required for this module
@@ -86,24 +86,30 @@ it needs those keys.
### Emergency Modules
-Only C++ modules and job modules may be emergency modules. If, during an
-*exec* step in the sequence, a module fails, installation as a whole fails
-and the install is aborted. If there are emergency modules in the **same**
-exec block, those will be executed before the installation is aborted.
-Non-emergency modules are not executed.
+If, during an *exec* step in the sequence, a module fails, installation as
+a whole fails and the install is aborted. If there are emergency modules
+in the **same** exec block, those will be executed before the installation
+is aborted. Non-emergency modules are not executed.
If an emergency-module fails while processing emergency-modules for
another failed module, that failure is ignored and emergency-module
processing continues.
Use the EMERGENCY keyword in the CMake description of a C++ module
-to generate a suitable `module.desc`.
+to generate a suitable `module.desc`. For Python modules, manually add
+`emergency: true` to `module.desc`.
A module that is marked as an emergency module in its module.desc
must **also** set the *emergency* key to *true* in its configuration file
(see below). If it does not, the module is not considered to be an emergency
-module after all (this is so that you can have modules that have several
-instances, only some of which are actually needed for emergencies).
+module after all. This is so that you can have modules that have several
+instances, only some of which are actually needed for emergencies.
+
+In summary:
+- in `module.desc`, write `emergency: true` to make it **possible** to
+ run the module in emergency mode,
+- in `.conf`, write `emergency: true` to make that specific
+ module run in emergency mode.
### Module-specific configuration
@@ -112,6 +118,10 @@ named `.conf`. If such a file is present in the
module's directory, it can be shipped as a *default* configuration file.
This only happens if the CMake-time option `INSTALL_CONFIG` is on.
+The name of the configuration file for a given module can be
+influenced by the `settings.conf` of the overall Calamares configuration.
+By default, though, the module's own name is used.
+
Modules that have *noconfig* set to true will not attempt to
read a configuration file, and will not warn that one is missing;
conversely if *noconfig* is set to false (or is missing, since
@@ -169,6 +179,26 @@ it is possible to take the whole installation-process into account
for determining the relative weights there.
+## Global storage keys
+Some modules place values in global storage so that they can be referenced later by other modules or even other parts of the same module. The following table represents a partial list of the values available as well as where they originate from and which module consume them.
+
+Key|Source|Consumers|Description
+---|---|---|---
+btrfsSubvolumes|mount|fstab|List of maps containing the mountpoint and btrtfs subvolume
+btrfsRootSubvolume|mount|bootloader, luksopenswaphook|String containing the subvolume mounted at root
+efiSystemPartition|partition|bootloader, fstab|String containing the path to the ESP relative to the installed system
+extraMounts|mount|unpackfs|List of maps holding metadata for the temporary mountpoints used by the installer
+hostname|users||A string containing the hostname of the new system
+netinstallAdd|packagechooser|netinstall|Data to add to netinstall tree. Same format as netinstall.yaml
+netinstallSelect|packagechooser|netinstall|List of group names to select in the netinstall tree
+partitions|partition, rawfs|numerous modules|List of maps of metadata about each partition
+rootMountPoint|mount|numerous modules|A string with the absolute path to the root mountpoint
+username|users|networkcfg, plasmainf, preservefiles|A string containing the username of the new user
+zfsDatasets|zfs|bootloader, grubcfg, mount|List of maps of zfs datasets including the name and mount information
+zfsInfo|partition|mount, zfs|List of encrypted zfs partitions and the encription info
+zfsPoolInfo|zfs|mount, umount|List of maps of zfs pool info including the name and mountpoint
+
+
## C++ modules
> Type: viewmodule, jobmodule
diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index 9f9ad84aa..b28412b0f 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -46,6 +46,16 @@ efiBootMgr: "efibootmgr"
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
+# There are some special words possible at the end of *efiBootloaderId*:
+# @@SERIAL@@ can be used to obtain a uniquely-numbered suffix
+# that is added to the Id (yielding, e.g., `dirname1` or `dirname72`)
+# @@RANDOM@@ can be used to obtain a unique 4-digit hex suffix
+# @@PHRASE@@ can be used to obtain a unique 1-to-3-word suffix
+# from a dictionary of space-themed words
+# Note that these must be at the **end** of the *efiBootloaderId* value.
+# There must also be at most one of them. If there is none, no suffix-
+# processing is done and the *efiBootloaderId* is used unchanged.
+#
# efiBootloaderId: "dirname"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 25c7e0d9b..c7bc741de 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -224,7 +224,7 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker
# Copy kernel and initramfs to a subdirectory of /efi partition
files_dir = os.path.join(install_path + efi_dir, entry_name)
- os.mkdir(files_dir)
+ os.makedirs(files_dir, exist_ok=True)
kernel_path = install_path + kernel
kernel_name = os.path.basename(kernel_path)
@@ -268,10 +268,166 @@ def create_loader(loader_path, entry):
loader_file.write(line)
-def efi_label():
+class suffix_iterator(object):
+ """
+ Wrapper for one of the "generator" classes below to behave like
+ a proper Python iterator. The iterator is initialized with a
+ maximum number of attempts to generate a new suffix.
+ """
+ def __init__(self, attempts, generator):
+ self.generator = generator
+ self.attempts = attempts
+ self.counter = 0
+
+ def __iter__(self):
+ return self
+
+ def __next__(self):
+ self.counter += 1
+ if self.counter <= self.attempts:
+ return self.generator.next()
+ raise StopIteration
+
+
+class serialEfi(object):
+ """
+ EFI Id generator that appends a serial number to the given name.
+ """
+ def __init__(self, name):
+ self.name = name
+ # So the first call to next() will bump it to 0
+ self.counter = -1
+
+ def next(self):
+ self.counter += 1
+ if self.counter > 0:
+ return "{!s}{!s}".format(self.name, self.counter)
+ else:
+ return self.name
+
+
+def render_in_base(value, base_values, length=-1):
+ """
+ Renders @p value in base-N, where N is the number of
+ items in @p base_values. When rendering, use the items
+ of @p base_values (e.g. use "0123456789" to get regular decimal
+ rendering, or "ABCDEFGHIJ" for letters-as-numbers 'encoding').
+
+ If length is positive, pads out to at least that long with
+ leading "zeroes", whatever base_values[0] is.
+ """
+ if value < 0:
+ raise ValueError("Cannot render negative values")
+ if len(base_values) < 2:
+ raise ValueError("Insufficient items for base-N rendering")
+ if length < 1:
+ length = 1
+ digits = []
+ base = len(base_values)
+ while value > 0:
+ place = value % base
+ value = value // base
+ digits.append(base_values[place])
+ while len(digits) < length:
+ digits.append(base_values[0])
+ return "".join(reversed(digits))
+
+
+class randomEfi(object):
+ """
+ EFI Id generator that appends a random 4-digit hex number to the given name.
+ """
+ def __init__(self, name):
+ self.name = name
+ # So the first call to next() will bump it to 0
+ self.counter = -1
+
+ def next(self):
+ self.counter += 1
+ if self.counter > 0:
+ import random
+ v = random.randint(0, 65535) # 16 bits
+ return "{!s}{!s}".format(self.name, render_in_base(v, "0123456789ABCDEF", 4))
+ else:
+ return self.name
+
+
+class phraseEfi(object):
+ """
+ EFI Id generator that appends a random phrase to the given name.
+ """
+ words = ("Sun", "Moon", "Mars", "Soyuz", "Falcon", "Kuaizhou", "Gaganyaan")
+
+ def __init__(self, name):
+ self.name = name
+ # So the first call to next() will bump it to 0
+ self.counter = -1
+
+ def next(self):
+ self.counter += 1
+ if self.counter > 0:
+ import random
+ desired_length = 1 + self.counter // 5
+ v = random.randint(0, len(self.words) ** desired_length)
+ return "{!s}{!s}".format(self.name, render_in_base(v, self.words))
+ else:
+ return self.name
+
+
+def get_efi_suffix_generator(name):
+ """
+ Handle EFI bootloader Ids with @@@@ for suffix-processing.
+ """
+ if "@@" not in name:
+ raise ValueError("Misplaced call to get_efi_suffix_generator, no @@")
+ parts = name.split("@@")
+ if len(parts) != 3:
+ raise ValueError("EFI Id {!r} is malformed".format(name))
+ if parts[2]:
+ # Supposed to be empty because the string ends with "@@"
+ raise ValueError("EFI Id {!r} is malformed".format(name))
+ if parts[1] not in ("SERIAL", "RANDOM", "PHRASE"):
+ raise ValueError("EFI suffix {!r} is unknown".format(parts[1]))
+
+ generator = None
+ if parts[1] == "SERIAL":
+ generator = serialEfi(parts[0])
+ elif parts[1] == "RANDOM":
+ generator = randomEfi(parts[0])
+ elif parts[1] == "PHRASE":
+ generator = phraseEfi(parts[0])
+ if generator is None:
+ raise ValueError("EFI suffix {!r} is unsupported".format(parts[1]))
+
+ return generator
+
+
+def change_efi_suffix(efi_directory, bootloader_id):
+ """
+ Returns a label based on @p bootloader_id that is usable within
+ @p efi_directory. If there is a @@@@ suffix marker
+ in the given id, tries to generate a unique label.
+ """
+ if bootloader_id.endswith("@@"):
+ # Do 10 attempts with any suffix generator
+ g = suffix_iterator(10, get_efi_suffix_generator(bootloader_id))
+ else:
+ # Just one attempt
+ g = [bootloader_id]
+
+ for candidate_name in g:
+ if not os.path.exists(os.path.join(efi_directory, candidate_name)):
+ return candidate_name
+ return bootloader_id
+
+
+def efi_label(efi_directory):
+ """
+ Returns a sanitized label, possibly unique, that can be
+ used within @p efi_directory.
+ """
if "efiBootloaderId" in libcalamares.job.configuration:
- efi_bootloader_id = libcalamares.job.configuration[
- "efiBootloaderId"]
+ efi_bootloader_id = change_efi_suffix( efi_directory, libcalamares.job.configuration["efiBootloaderId"] )
else:
branding = libcalamares.globalstorage.value("branding")
efi_bootloader_id = branding["bootloaderEntryName"]
@@ -390,7 +546,7 @@ def run_grub_mkconfig(partitions, output_file):
check_target_env_call([libcalamares.job.configuration["grubMkconfig"], "-o", output_file])
-def run_grub_install(fw_type, partitions, efi_directory=None):
+def run_grub_install(fw_type, partitions, efi_directory):
"""
Runs grub-install in the target environment
@@ -407,7 +563,8 @@ def run_grub_install(fw_type, partitions, efi_directory=None):
check_target_env_call(["sh", "-c", "echo ZPOOL_VDEV_NAME_PATH=1 >> /etc/environment"])
if fw_type == "efi":
- efi_bootloader_id = efi_label()
+ assert efi_directory is not None
+ efi_bootloader_id = efi_label(efi_directory)
efi_target, efi_grub_file, efi_boot_file = get_grub_efi_parameters()
if is_zfs:
@@ -421,6 +578,7 @@ def run_grub_install(fw_type, partitions, efi_directory=None):
"--bootloader-id=" + efi_bootloader_id,
"--force"])
else:
+ assert efi_directory is None
if libcalamares.globalstorage.value("bootLoader") is None:
return
@@ -462,7 +620,7 @@ def install_grub(efi_directory, fw_type):
if not os.path.isdir(install_efi_directory):
os.makedirs(install_efi_directory)
- efi_bootloader_id = efi_label()
+ efi_bootloader_id = efi_label(efi_directory)
efi_target, efi_grub_file, efi_boot_file = get_grub_efi_parameters()
@@ -497,7 +655,7 @@ def install_grub(efi_directory, fw_type):
shutil.copy2(efi_file_source, efi_file_target)
else:
libcalamares.utils.debug("Bootloader: grub (bios)")
- run_grub_install(fw_type, partitions)
+ run_grub_install(fw_type, partitions, None)
run_grub_mkconfig(partitions, libcalamares.job.configuration["grubCfg"])
@@ -506,7 +664,7 @@ def install_secureboot(efi_directory):
"""
Installs the secureboot shim in the system by calling efibootmgr.
"""
- efi_bootloader_id = efi_label()
+ efi_bootloader_id = efi_label(efi_directory)
install_path = libcalamares.globalstorage.value("rootMountPoint")
install_efi_directory = install_path + efi_directory
diff --git a/src/modules/bootloader/tests/CMakeTests.txt b/src/modules/bootloader/tests/CMakeTests.txt
new file mode 100644
index 000000000..5b16d5009
--- /dev/null
+++ b/src/modules/bootloader/tests/CMakeTests.txt
@@ -0,0 +1,7 @@
+# We have tests to exercise some of the module internals.
+# Those tests conventionally live in Python files here in the tests/ directory. Add them.
+add_test(
+ NAME test-bootloader-efiname
+ COMMAND env PYTHONPATH=.: python3 ${CMAKE_CURRENT_LIST_DIR}/test-bootloader-efiname.py
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
diff --git a/src/modules/bootloader/tests/test-bootloader-efiname.py b/src/modules/bootloader/tests/test-bootloader-efiname.py
new file mode 100644
index 000000000..67cb91747
--- /dev/null
+++ b/src/modules/bootloader/tests/test-bootloader-efiname.py
@@ -0,0 +1,64 @@
+# Calamares Boilerplate
+import libcalamares
+libcalamares.globalstorage = libcalamares.GlobalStorage(None)
+libcalamares.globalstorage.insert("testing", True)
+
+# Module prep-work
+from src.modules.bootloader import main
+
+# Specific Bootloader test
+g = main.get_efi_suffix_generator("derp@@SERIAL@@")
+assert g is not None
+assert g.next() == "derp" # First time, no suffix
+for n in range(9):
+ print(g.next())
+# We called next() 10 times in total, starting from 0
+assert g.next() == "derp10"
+
+g = main.get_efi_suffix_generator("derp@@RANDOM@@")
+assert g is not None
+for n in range(10):
+ print(g.next())
+# it's random, nothing to assert
+
+g = main.get_efi_suffix_generator("derp@@PHRASE@@")
+assert g is not None
+for n in range(10):
+ print(g.next())
+# it's random, nothing to assert
+
+# Check invalid things
+try:
+ g = main.get_efi_suffix_generator("derp")
+ raise TypeError("Shouldn't get generator (no indicator)")
+except ValueError as e:
+ pass
+
+try:
+ g = main.get_efi_suffix_generator("derp@@HEX@@")
+ raise TypeError("Shouldn't get generator (unknown indicator)")
+except ValueError as e:
+ pass
+
+try:
+ g = main.get_efi_suffix_generator("derp@@SERIAL@@x")
+ raise TypeError("Shouldn't get generator (trailing garbage)")
+except ValueError as e:
+ pass
+
+try:
+ g = main.get_efi_suffix_generator("derp@@SERIAL@@@@RANDOM@@")
+ raise TypeError("Shouldn't get generator (multiple indicators)")
+except ValueError as e:
+ pass
+
+
+# Try the generator (assuming no calamares- test files exist in /tmp)
+import os
+assert "calamares-single" == main.change_efi_suffix("/tmp", "calamares-single")
+assert "calamares-serial" == main.change_efi_suffix("/tmp", "calamares-serial@@SERIAL@@")
+try:
+ os.makedirs("/tmp/calamares-serial", exist_ok=True)
+ assert "calamares-serial1" == main.change_efi_suffix("/tmp", "calamares-serial@@SERIAL@@")
+finally:
+ os.rmdir("/tmp/calamares-serial")
diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf
index 9c76f0c46..1e87acddc 100644
--- a/src/modules/fstab/fstab.conf
+++ b/src/modules/fstab/fstab.conf
@@ -18,10 +18,16 @@
#
# btrfs_swap options are used when a swapfile is chosen with a btrfs root
# the options are applied to the subvolume which holds the swap partition
+#
+# The settings shown here apply only the btrfs defaults; these
+# are generally the right ones. Commented-out lines show other
+# options wich **might** be applicable for specific situations.
mountOptions:
default: defaults,noatime
- btrfs: defaults,noatime,autodefrag,compress=zstd
- btrfs_swap: defaults,noatime
+ # btrfs: defaults,noatime,autodefrag,compress=zstd
+ btrfs: defaults
+ # btrfs_swap: defaults,noatime
+ btrfs_swap: defaults
# Mount options to use for the EFI System Partition. If not defined, the
# *mountOptions* for *vfat* are used, or if that is not set either,
@@ -49,7 +55,7 @@ efiMountOptions: umask=0077
# The standard configuration applies asynchronous discard support and ssd optimizations to btrfs
# and does nothing for other filesystems.
ssdExtraMountOptions:
- btrfs: discard=async,ssd,commit=120
+ btrfs: discard=async
# Additional options added to each line in /etc/crypttab
crypttabOptions: luks
diff --git a/src/modules/fstab/test2.yaml b/src/modules/fstab/test2.yaml
new file mode 100644
index 000000000..0e91bf649
--- /dev/null
+++ b/src/modules/fstab/test2.yaml
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# This test shows how btrfs root would work
+rootMountPoint: /tmp/mount
+partitions:
+ - device: /dev/sda1
+ fs: btrfs
+ mountPoint: /
+ uuid: 2a00f1d5-1217-49a7-bedd-b55c85764732
+ - device: /dev/sda2
+ fs: swap
+ uuid: 59406569-446f-4730-a874-9f6b4b44fee3
+ mountPoint:
+ - device: /dev/sdb1
+ fs: btrfs
+ mountPoint: /home
+ uuid: 59406569-abcd-1234-a874-9f6b4b44fee3
+btrfsSubvolumes:
+ - mountPoint: /
+ subvolume: "@ROOT"
+ - mountPoint: /var
+ subvolume: "@var"
+ - mountPoint: /usr/local
+ subvolume: "@local"
diff --git a/src/modules/grubcfg/grubcfg.conf b/src/modules/grubcfg/grubcfg.conf
index 33c2a72ab..afc5e89b8 100644
--- a/src/modules/grubcfg/grubcfg.conf
+++ b/src/modules/grubcfg/grubcfg.conf
@@ -29,8 +29,16 @@ prefer_grub_d: false
# kept, not updated to the *bootloaderEntryName* from the branding file.
# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
# some way (e.g. uses shell-command substitution).
+#
+# TODO:3.3:snake-case this key
keepDistributor: false
+# The default kernel params that should always be applied.
+# This is an array of strings. If it is unset, the default is
+# `["quiet"]`. To avoid the default, explicitly set this key
+# to an empty list, `[]`.
+kernel_params: [ "quiet" ]
+
# Default entries to write to /etc/default/grub if it does not exist yet or if
# we are overwriting it.
#
diff --git a/src/modules/grubcfg/grubcfg.schema.yaml b/src/modules/grubcfg/grubcfg.schema.yaml
index f1bf2cc03..35d63c063 100644
--- a/src/modules/grubcfg/grubcfg.schema.yaml
+++ b/src/modules/grubcfg/grubcfg.schema.yaml
@@ -7,8 +7,10 @@ additionalProperties: false
type: object
properties:
overwrite: { type: boolean, default: false }
+ # TODO:3.3:snake-case this key
keepDistributor: { type: boolean, default: false }
prefer_grub_d: { type: boolean, default: false }
+ kernel_params: { type: array, items: { type: string } }
defaults:
type: object
additionalProperties: true # Other fields are acceptable
diff --git a/src/modules/grubcfg/main.py b/src/modules/grubcfg/main.py
index 521293bf9..45018642c 100644
--- a/src/modules/grubcfg/main.py
+++ b/src/modules/grubcfg/main.py
@@ -174,7 +174,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
if partition["fs"] == "zfs" and partition["mountPoint"] == "/":
zfs_root_path = get_zfs_root()
- kernel_params = ["quiet"]
+ kernel_params = libcalamares.job.configuration.get("kernel_params", ["quiet"])
# Currently, grub doesn't detect this properly so it must be set manually
if zfs_root_path:
diff --git a/src/modules/initcpio/InitcpioJob.cpp b/src/modules/initcpio/InitcpioJob.cpp
index b96f3b316..df995ccbf 100644
--- a/src/modules/initcpio/InitcpioJob.cpp
+++ b/src/modules/initcpio/InitcpioJob.cpp
@@ -1,6 +1,7 @@
/* === This file is part of Calamares - ===
*
* SPDX-FileCopyrightText: 2019 Adriaan de Groot
+ * SPDX-FileCopyrightText: 2022 Evan James
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Calamares is Free Software: see the License-Identifier above.
@@ -31,15 +32,22 @@ InitcpioJob::prettyName() const
return tr( "Creating initramfs with mkinitcpio." );
}
+/** @brief Sets secure permissions on each initramfs
+ *
+ * Iterates over each initramfs contained directly in the directory @p d.
+ * For each initramfs found, the permissions are set to owner read/write only.
+ *
+ */
void
fixPermissions( const QDir& d )
{
- for ( const auto& fi : d.entryInfoList( { "initramfs*" }, QDir::Files ) )
+ const auto initramList = d.entryInfoList( { "initramfs*" }, QDir::Files );
+ for ( const auto& fi : initramList )
{
QFile f( fi.absoluteFilePath() );
if ( f.exists() )
{
- cDebug() << "initcpio fixing permissions for" << f.fileName();
+ cDebug() << "initcpio setting permissions for" << f.fileName();
f.setPermissions( QFileDevice::ReadOwner | QFileDevice::WriteOwner );
}
}
@@ -63,9 +71,19 @@ InitcpioJob::exec()
}
}
+ // If the kernel option isn't set to a specific kernel, run mkinitcpio on all kernels
+ QStringList command = { "mkinitcpio" };
+ if ( m_kernel.isEmpty() || m_kernel == "all" )
+ {
+ command.append( "-P" );
+ }
+ else
+ {
+ command.append( { "-p", m_kernel } );
+ }
+
cDebug() << "Updating initramfs with kernel" << m_kernel;
- auto r = CalamaresUtils::System::instance()->targetEnvCommand(
- { "mkinitcpio", "-p", m_kernel }, QString(), QString() /* no timeout , 0 */ );
+ auto r = CalamaresUtils::System::instance()->targetEnvCommand( command, QString(), QString() /* no timeout , 0 */ );
return r.explainProcess( "mkinitcpio", std::chrono::seconds( 10 ) /* fake timeout */ );
}
@@ -73,28 +91,6 @@ void
InitcpioJob::setConfigurationMap( const QVariantMap& configurationMap )
{
m_kernel = CalamaresUtils::getString( configurationMap, "kernel" );
- if ( m_kernel.isEmpty() )
- {
- m_kernel = QStringLiteral( "all" );
- }
- else if ( m_kernel == "$uname" )
- {
- auto r = CalamaresUtils::System::runCommand( CalamaresUtils::System::RunLocation::RunInHost,
- { "/bin/uname", "-r" },
- QString(),
- QString(),
- std::chrono::seconds( 3 ) );
- if ( r.getExitCode() == 0 )
- {
- m_kernel = r.getOutput();
- cDebug() << "*initcpio* using running kernel" << m_kernel;
- }
- else
- {
- cWarning() << "*initcpio* could not determine running kernel, using 'all'." << Logger::Continuation
- << r.getExitCode() << r.getOutput();
- }
- }
m_unsafe = CalamaresUtils::getBool( configurationMap, "be_unsafe", false );
}
diff --git a/src/modules/initcpio/initcpio.conf b/src/modules/initcpio/initcpio.conf
index 717a511df..d2a126864 100644
--- a/src/modules/initcpio/initcpio.conf
+++ b/src/modules/initcpio/initcpio.conf
@@ -5,21 +5,22 @@
---
# This key defines the kernel to be loaded.
# It can have the following values:
-# - empty or unset, interpreted as "all"
-# - the literal string "$uname" (without quotes, with dollar),
-# which will use the output of `uname -r` to determine the
-# running kernel, and use that.
-# - any other string.
+# - the name of a single mkinitcpio preset
+# - empty or unset
+# - the literal string "all"
#
-# Whatever is set, that string is passed as *preset* argument to the
-# `-p` option of *mkinitcpio*. Take care that both "$uname" operates
-# in the host system, and might not be correct if the target system is
-# updated (to a newer kernel) as part of the installation.
+# If kernel is set to "all" or empty/unset then mkinitpio is called for all
+# kernels. Otherwise it is called with a single preset with the value
+# contained in kernel.
#
-# Note that "all" is probably not a good preset to use either.
-kernel: linux312
+kernel: linux
# Set this to true to turn off mitigations for lax file
# permissions on initramfs (which, in turn, can compromise
# your LUKS encryption keys, CVS-2019-13179).
+#
+# If your initramfs are stored in the EFI partition or another non-POSIX
+# filesystem, this has no effect as the file permissions cannot be changed.
+# In this case, ensure the partition is mounted securely.
+#
be_unsafe: false
diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 8fc305829..1fd4af714 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -180,7 +180,8 @@ def find_initcpio_features(partitions, root_mount_point):
if partition["fs"] == "btrfs":
uses_btrfs = True
- if partition["fs"] == "zfs":
+ # In addition to checking the filesystem, check to ensure that zfs is enabled
+ if partition["fs"] == "zfs" and libcalamares.globalstorage.contains("zfsPoolInfo"):
uses_zfs = True
if "lvm2" in partition["fs"]:
diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp
index 1b10a1a05..d83b4673c 100644
--- a/src/modules/initramfs/InitramfsJob.cpp
+++ b/src/modules/initramfs/InitramfsJob.cpp
@@ -81,6 +81,7 @@ InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap )
}
else
{
+ m_kernel = QStringLiteral( "all" );
cWarning() << "*initramfs* could not determine running kernel, using 'all'." << Logger::Continuation
<< r.getExitCode() << r.getOutput();
}
diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
index afd39936b..ea30c21ef 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include
@@ -41,8 +42,10 @@ InteractiveTerminalPage::InteractiveTerminalPage( QWidget* parent )
void
InteractiveTerminalPage::errorKonsoleNotInstalled()
{
- QMessageBox mb(QMessageBox::Critical,
- tr( "Konsole not installed" ), tr( "Please install KDE Konsole and try again!" ), QMessageBox::Ok );
+ QMessageBox mb( QMessageBox::Critical,
+ tr( "Konsole not installed" ),
+ tr( "Please install KDE Konsole and try again!" ),
+ QMessageBox::Ok );
Calamares::fixButtonLabels( &mb );
mb.exec();
}
@@ -54,20 +57,30 @@ InteractiveTerminalPage::onActivate()
{
return;
}
- // For whatever reason, instead of simply linking against a library we
- // need to do a runtime query to KService just to get a sodding terminal
- // widget.
+
+#if KCOREADDONS_VERSION_MAJOR != 5
+#error Incompatible with not-KF5
+#endif
+#if KCOREADDONS_VERSION_MINOR >= 86
+ // 5.86 deprecated a bunch of KService and PluginFactory and related methods
+ auto md = KPluginMetaData::findPluginById( QString(), "konsolepart" );
+ if ( !md.isValid() )
+ {
+ errorKonsoleNotInstalled();
+ return;
+ }
+ auto* p = KPluginFactory::instantiatePlugin< KParts::ReadOnlyPart >( md, this ).plugin;
+#else
KService::Ptr service = KService::serviceByDesktopName( "konsolepart" );
if ( !service )
{
- // And all of this hoping the Konsole application is installed. If not,
- // tough cookies.
errorKonsoleNotInstalled();
return;
}
// Create one instance of konsolepart.
KParts::ReadOnlyPart* p = service->createInstance< KParts::ReadOnlyPart >( this, this, {} );
+#endif
if ( !p )
{
// One more opportunity for the loading operation to fail.
@@ -91,7 +104,6 @@ InteractiveTerminalPage::onActivate()
m_termHostWidget = p->widget();
m_layout->addWidget( m_termHostWidget );
- cDebug() << "Part widget ought to be" << m_termHostWidget->metaObject()->className();
t->showShellInDir( QDir::home().path() );
t->sendInput( QString( "%1\n" ).arg( m_command ) );
diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp
index ce48edd82..8593f8385 100644
--- a/src/modules/locale/Config.cpp
+++ b/src/modules/locale/Config.cpp
@@ -221,6 +221,11 @@ Config::setCurrentLocation()
{
setCurrentLocation( m_startingTimezone.first, m_startingTimezone.second );
}
+ if ( !m_selectedLocaleConfiguration.explicit_lang )
+ {
+ auto newLocale = automaticLocaleConfiguration();
+ setLanguage( newLocale.language() );
+ }
}
void
@@ -252,15 +257,21 @@ Config::setCurrentLocation( const QString& regionName, const QString& zoneName )
void
Config::setCurrentLocation( const CalamaresUtils::Locale::TimeZoneData* location )
{
- if ( location != m_currentLocation )
+ const bool updateLocation = ( location != m_currentLocation );
+ if ( updateLocation )
{
m_currentLocation = location;
- // Overwrite those settings that have not been made explicit.
- auto newLocale = automaticLocaleConfiguration();
- if ( !m_selectedLocaleConfiguration.explicit_lang )
- {
- setLanguage( newLocale.language() );
- }
+ }
+
+ // lang should be always be updated
+ auto newLocale = automaticLocaleConfiguration();
+ if ( !m_selectedLocaleConfiguration.explicit_lang )
+ {
+ setLanguage( newLocale.language() );
+ }
+
+ if ( updateLocation )
+ {
if ( !m_selectedLocaleConfiguration.explicit_lc )
{
m_selectedLocaleConfiguration.lc_numeric = newLocale.lc_numeric;
diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt
new file mode 100644
index 000000000..caede06a7
--- /dev/null
+++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt
@@ -0,0 +1,22 @@
+# === This file is part of Calamares - ===
+#
+# SPDX-FileCopyrightText: 2021 Adriaan de Groot
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+# Because LUKS Open Swap Hook (Job) is such a mouthful, we'll
+# use LOSH all over the place as a shorthand.
+calamares_add_plugin( luksopenswaphookcfg
+ TYPE job
+ EXPORT_MACRO PLUGINDLLEXPORT_PRO
+ SOURCES
+ LOSHJob.cpp
+ SHARED_LIB
+)
+
+calamares_add_test(
+ luksopenswaphooktest
+ SOURCES
+ LOSHJob.cpp
+ Tests.cpp
+)
diff --git a/src/modules/luksopenswaphookcfg/LOSHInfo.h b/src/modules/luksopenswaphookcfg/LOSHInfo.h
new file mode 100644
index 000000000..1a87f4e61
--- /dev/null
+++ b/src/modules/luksopenswaphookcfg/LOSHInfo.h
@@ -0,0 +1,66 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+#ifndef LUKSOPENSWAPHOOKCFG_LOSHINFO_H
+#define LUKSOPENSWAPHOOKCFG_LOSHINFO_H
+
+#include
+
+/** @brief Information needed to create a suitable config file
+ *
+ * The LUKS swap configuration has a handful of keys that need to
+ * be written to the config file. This struct holds those keys
+ * and can find the key values from Global Storage (where the
+ * *partition* module sets them).
+ */
+struct LOSHInfo
+{
+ // Member names copied from Python code
+ QString swap_outer_uuid;
+ QString swap_mapper_name;
+ QString mountable_keyfile_device;
+ QString swap_device_path;
+ QString keyfile_device_mount_options;
+
+ bool isValid() const { return !swap_device_path.isEmpty(); }
+
+ /** @brief Helper method for doing key-value replacements
+ *
+ * Given a named @p key (e.g. "duck", or "swap_device"), returns the
+ * value set for that key. Invalid keys (e.g. "duck") return an empty string.
+ */
+ QString replacementFor( const QString& key ) const
+ {
+ if ( key == QStringLiteral( "swap_device" ) )
+ {
+ return swap_device_path;
+ }
+ if ( key == QStringLiteral( "crypt_swap_name" ) )
+ {
+ return swap_mapper_name;
+ }
+ if ( key == QStringLiteral( "keyfile_device" ) )
+ {
+ return mountable_keyfile_device;
+ }
+ if ( key == QStringLiteral( "keyfile_filename" ) )
+ {
+ return QStringLiteral( "crypto_keyfile.bin" );
+ }
+ if ( key == QStringLiteral( "keyfile_device_mount_options" ) )
+ {
+ return keyfile_device_mount_options;
+ }
+ return QString();
+ }
+
+ /** @brief Creates a struct from information already set in GS
+ *
+ */
+ static LOSHInfo fromGlobalStorage();
+};
+
+#endif
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
new file mode 100644
index 000000000..42f160460
--- /dev/null
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -0,0 +1,181 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+#include "LOSHJob.h"
+
+#include "LOSHInfo.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Permissions.h"
+#include "utils/PluginFactory.h"
+#include "utils/String.h"
+#include "utils/Variant.h"
+
+#include
+#include
+#include
+#include
+
+LOSHJob::LOSHJob( QObject* parent )
+ : Calamares::CppJob( parent )
+{
+}
+
+LOSHJob::~LOSHJob() {}
+
+
+QString
+LOSHJob::prettyName() const
+{
+ return tr( "Configuring encrypted swap." );
+}
+
+STATICTEST QString
+get_assignment_part( const QString& line )
+{
+ static QRegularExpression re( "^[# \\t]*([A-Za-z_]+)[ \\t]*=" );
+ auto m = re.match( line );
+ if ( m.hasMatch() )
+ {
+ return m.captured( 1 );
+ }
+ return QString();
+}
+
+/** Writes the config file at @p path
+ *
+ * NOTE: @p path is relative to the target system, not an absolute path.
+ */
+STATICTEST void
+write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& info )
+{
+ if ( info.isValid() )
+ {
+ for ( auto& line : contents )
+ {
+ const QString key = get_assignment_part( line );
+ QString replacement = info.replacementFor( key );
+ if ( !replacement.isEmpty() )
+ {
+ line.clear();
+ line.append( QStringLiteral( "%1=%2" ).arg( key, replacement ) );
+ }
+ }
+ cDebug() << "Writing" << contents.length() << "line configuration to" << path;
+ // \n between each two lines, and a \n at the end
+ CalamaresUtils::System::instance()->createTargetFile(
+ path, contents.join( '\n' ).append( '\n' ).toUtf8(), CalamaresUtils::System::WriteMode::Overwrite );
+ }
+ else
+ {
+ cDebug() << "Will not write an invalid configuration to" << path;
+ }
+}
+
+Calamares::JobResult
+LOSHJob::exec()
+{
+ const auto* sys = CalamaresUtils::System::instance();
+ if ( !sys )
+ {
+ return Calamares::JobResult::internalError(
+ "LuksOpenSwapHook", tr( "No target system available." ), Calamares::JobResult::InvalidConfiguration );
+ }
+
+ Calamares::GlobalStorage* gs
+ = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ if ( !gs || gs->value( "rootMountPoint" ).toString().isEmpty() )
+ {
+ return Calamares::JobResult::internalError(
+ "LuksOpenSwapHook", tr( "No rootMountPoint is set." ), Calamares::JobResult::InvalidConfiguration );
+ }
+ if ( m_configFilePath.isEmpty() )
+ {
+ return Calamares::JobResult::internalError(
+ "LuksOpenSwapHook", tr( "No configFilePath is set." ), Calamares::JobResult::InvalidConfiguration );
+ }
+
+ QStringList contents = sys->readTargetFile( m_configFilePath );
+ if ( contents.isEmpty() )
+ {
+ contents << QStringLiteral( "# swap_device=" ) << QStringLiteral( "# crypt_swap_name=" )
+ << QStringLiteral( "# keyfile_device=" ) << QStringLiteral( "# keyfile_filename=" )
+ << QStringLiteral( "# keyfile_device_mount_options" );
+ }
+
+ write_openswap_conf( m_configFilePath, contents, LOSHInfo::fromGlobalStorage() );
+ return Calamares::JobResult::ok();
+}
+
+void
+LOSHJob::setConfigurationMap( const QVariantMap& configurationMap )
+{
+ m_configFilePath = CalamaresUtils::getString(
+ configurationMap, QStringLiteral( "configFilePath" ), QStringLiteral( "/etc/openswap.conf" ) );
+}
+
+STATICTEST void
+globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info )
+{
+ if ( !gs )
+ {
+ return;
+ }
+ QVariantList l = gs->value( "partitions" ).toList();
+ if ( l.isEmpty() )
+ {
+ return;
+ }
+
+ for ( const auto& pv : l )
+ {
+ const QVariantMap partition = pv.toMap();
+ if ( !partition.isEmpty() )
+ {
+ QString mountPoint = partition.value( "mountPoint" ).toString();
+ QString fileSystem = partition.value( "fs" ).toString();
+ QString luksMapperName = partition.value( "luksMapperName" ).toString();
+ // if partition["fs"] == "linuxswap" and "luksMapperName" in partition:
+ if ( fileSystem == QStringLiteral( "linuxswap" ) && !luksMapperName.isEmpty() )
+ {
+ info.swap_outer_uuid = partition.value( "luksUuid" ).toString();
+ info.swap_mapper_name = luksMapperName;
+ }
+ else if ( mountPoint == QStringLiteral( "/" ) && !luksMapperName.isEmpty() )
+ {
+
+ info.mountable_keyfile_device = QStringLiteral( "/dev/mapper/" ) + luksMapperName;
+ }
+ }
+ }
+
+ if ( !info.mountable_keyfile_device.isEmpty() && !info.swap_outer_uuid.isEmpty() )
+ {
+ info.swap_device_path = QStringLiteral( "/dev/disk/by-uuid/" ) + info.swap_outer_uuid;
+ }
+
+ QString btrfsRootSubvolume = gs->value( "btrfsRootSubvolume" ).toString();
+ if ( !btrfsRootSubvolume.isEmpty() )
+ {
+ CalamaresUtils::removeLeading( btrfsRootSubvolume, '/' );
+ info.keyfile_device_mount_options
+ = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume;
+ }
+}
+
+LOSHInfo
+LOSHInfo::fromGlobalStorage()
+{
+ LOSHInfo i {};
+ globalStoragePartitionInfo(
+ Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr, i );
+ return i;
+}
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( LOSHJobFactory, registerPlugin< LOSHJob >(); )
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.h b/src/modules/luksopenswaphookcfg/LOSHJob.h
new file mode 100644
index 000000000..4a435a935
--- /dev/null
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.h
@@ -0,0 +1,37 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+#ifndef LUKSOPENSWAPHOOKCFG_LOSHJOB_H
+#define LUKSOPENSWAPHOOKCFG_LOSHJOB_H
+
+#include "CppJob.h"
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+
+#include
+#include
+
+class PLUGINDLLEXPORT LOSHJob : public Calamares::CppJob
+{
+ Q_OBJECT
+
+public:
+ explicit LOSHJob( QObject* parent = nullptr );
+ ~LOSHJob() override;
+
+ QString prettyName() const override;
+
+ Calamares::JobResult exec() override;
+
+ void setConfigurationMap( const QVariantMap& configurationMap ) override;
+
+private:
+ QString m_configFilePath;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( LOSHJobFactory )
+
+#endif
diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp
new file mode 100644
index 000000000..840bd9355
--- /dev/null
+++ b/src/modules/luksopenswaphookcfg/Tests.cpp
@@ -0,0 +1,253 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#include "LOSHInfo.h"
+#include "LOSHJob.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+
+#include
+
+// LOSH = LUKS Open Swap Hook (Job)
+
+// Implementation details
+extern QString get_assignment_part( const QString& line );
+extern void write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& info );
+
+class LOSHTests : public QObject
+{
+ Q_OBJECT
+public:
+ LOSHTests();
+ ~LOSHTests() override {}
+
+private Q_SLOTS:
+ void initTestCase();
+
+ void testAssignmentExtraction_data();
+ void testAssignmentExtraction();
+
+ void testLOSHInfo();
+ void testConfigWriting();
+ void testJob();
+};
+
+LOSHTests::LOSHTests() {}
+
+void
+LOSHTests::initTestCase()
+{
+ Logger::setupLogLevel( Logger::LOGDEBUG );
+ cDebug() << "LOSH test started.";
+}
+
+
+void
+LOSHTests::testAssignmentExtraction_data()
+{
+ QTest::addColumn< QString >( "line" );
+ QTest::addColumn< QString >( "match" );
+
+ QTest::newRow( "empty" ) << QString() << QString();
+ QTest::newRow( "comment-only1" ) << QStringLiteral( "# " ) << QString();
+ QTest::newRow( "comment-only2" ) << QStringLiteral( "###" ) << QString();
+ QTest::newRow( "comment-only3" ) << QStringLiteral( "# # #" ) << QString();
+
+ QTest::newRow( "comment-text" ) << QStringLiteral( "# NOTE:" ) << QString();
+ QTest::newRow( "comment-story" ) << QStringLiteral( "# This is a shell comment" ) << QString();
+ // We look for assignments, but only for single-words
+ QTest::newRow( "comment-space-eq" ) << QStringLiteral( "# Check that a = b" ) << QString();
+
+
+ QTest::newRow( "assignment1" ) << QStringLiteral( "a=1" ) << QStringLiteral( "a" );
+ QTest::newRow( "assignment2" ) << QStringLiteral( "a = 1" ) << QStringLiteral( "a" );
+ QTest::newRow( "assignment3" ) << QStringLiteral( "# a=1" ) << QStringLiteral( "a" );
+ QTest::newRow( "assignment4" ) << QStringLiteral( "cows = 12" ) << QStringLiteral( "cows" );
+ QTest::newRow( "assignment5" ) << QStringLiteral( "# # cows=1" ) << QStringLiteral( "cows" );
+ QTest::newRow( "assignment6" ) << QStringLiteral( "# moose='cool' # not cows" ) << QStringLiteral( "moose" );
+ QTest::newRow( "assignment7" ) << QStringLiteral( " moose=cows=42" ) << QStringLiteral( "moose" );
+ QTest::newRow( "assignment8" ) << QStringLiteral( "#swap_device=/dev/something" )
+ << QStringLiteral( "swap_device" );
+ QTest::newRow( "assignment9" ) << QStringLiteral( "# swap_device=/dev/something" )
+ << QStringLiteral( "swap_device" );
+ QTest::newRow( "assignment10" ) << QStringLiteral( "swap_device=/dev/something" )
+ << QStringLiteral( "swap_device" );
+}
+
+void
+LOSHTests::testAssignmentExtraction()
+{
+ QFETCH( QString, line );
+ QFETCH( QString, match );
+
+ QCOMPARE( get_assignment_part( line ), match );
+}
+
+static CalamaresUtils::System*
+file_setup( const QTemporaryDir& tempRoot )
+{
+ CalamaresUtils::System* ss = CalamaresUtils::System::instance();
+ if ( !ss )
+ {
+ ss = new CalamaresUtils::System( true );
+ }
+
+ Calamares::GlobalStorage* gs
+ = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ if ( !gs )
+ {
+ cDebug() << "Creating new JobQueue";
+ (void)new Calamares::JobQueue();
+ gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ }
+ if ( gs )
+ {
+ // Working with a rootMountPoint set
+ gs->insert( "rootMountPoint", tempRoot.path() );
+ }
+ return ss;
+}
+
+static void
+make_valid_loshinfo( LOSHInfo& i )
+{
+ i.swap_outer_uuid = QStringLiteral( "UUID-0000" );
+ i.swap_mapper_name = QStringLiteral( "/dev/mapper/0000" );
+ i.swap_device_path = QStringLiteral( "/dev/sda0" );
+ i.mountable_keyfile_device = QStringLiteral( "/dev/ada0p0s0" );
+}
+
+void
+LOSHTests::testLOSHInfo()
+{
+ LOSHInfo i {};
+ QVERIFY( !i.isValid() );
+
+ make_valid_loshinfo( i );
+ QVERIFY( i.isValid() );
+ QCOMPARE( i.replacementFor( QStringLiteral( "swap_device" ) ), QStringLiteral( "/dev/sda0" ) );
+ QCOMPARE( i.replacementFor( QStringLiteral( "duck" ) ), QString() );
+}
+
+
+void
+LOSHTests::testConfigWriting()
+{
+ QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) );
+ QVERIFY( tempRoot.isValid() );
+ auto* ss = file_setup( tempRoot );
+ QVERIFY( ss );
+ QVERIFY( Calamares::JobQueue::instance()->globalStorage() );
+ QVERIFY( QFile::exists( tempRoot.path() ) );
+ QVERIFY( QFileInfo( tempRoot.path() ).isDir() );
+
+ const QString targetFilePath = QStringLiteral( "losh.conf" );
+ const QString filePath = tempRoot.filePath( targetFilePath );
+ QStringList contents { QStringLiteral( "# Calamares demo" ),
+ QStringLiteral( "# swap_device=a thing" ),
+ QStringLiteral( "# duck duck swap_device=another" ) };
+
+ // When the information is invalid, file contents are unchanged,
+ // and no file is written either.
+ LOSHInfo i {};
+ QVERIFY( !i.isValid() );
+ QVERIFY( !QFile::exists( filePath ) );
+ write_openswap_conf( targetFilePath, contents, i ); // Invalid i
+ QVERIFY( !QFile::exists( filePath ) );
+ QCOMPARE( contents.length(), 3 );
+ QCOMPARE( contents.at( 1 ).left( 4 ), QStringLiteral( "# s" ) );
+
+ // Can we write there at all?
+ QFile derp( filePath );
+ QVERIFY( derp.open( QIODevice::WriteOnly ) );
+ QVERIFY( derp.write( "xx", 2 ) );
+ derp.close();
+ QVERIFY( QFile::exists( filePath ) );
+ QVERIFY( QFile::remove( filePath ) );
+
+ // Once the information is valid, though, the file is written
+ make_valid_loshinfo( i );
+ QVERIFY( i.isValid() );
+ QVERIFY( !QFile::exists( filePath ) );
+ write_openswap_conf( targetFilePath, contents, i ); // Now it is valid
+ QVERIFY( QFile::exists( filePath ) );
+ QCOMPARE( contents.length(), 3 );
+ QCOMPARE( i.swap_device_path, QStringLiteral( "/dev/sda0" ) ); // expected key value
+ QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/sda0" ) ); // expected line
+
+ // readLine() returns with newlines-added
+ QFile f( filePath );
+ QVERIFY( f.open( QIODevice::ReadOnly ) );
+ QCOMPARE( f.readLine(), QStringLiteral( "# Calamares demo\n" ) );
+ QCOMPARE( f.readLine(), QStringLiteral( "swap_device=/dev/sda0\n" ) );
+ QCOMPARE( f.readLine(), QStringLiteral( "# duck duck swap_device=another\n" ) );
+ QCOMPARE( f.readLine(), QString() );
+ QVERIFY( f.atEnd() );
+
+ // Note how the contents is updated on every write_openswap_conf()
+ i.swap_device_path = QStringLiteral( "/dev/zram/0.zram" );
+ write_openswap_conf( targetFilePath, contents, i ); // Still valid
+ QCOMPARE( contents.length(), 3 );
+ QCOMPARE( i.swap_device_path, QStringLiteral( "/dev/zram/0.zram" ) ); // expected key value
+ QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/zram/0.zram" ) ); // expected line
+}
+
+
+void
+LOSHTests::testJob()
+{
+ QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) );
+ QVERIFY( tempRoot.isValid() );
+ auto* ss = file_setup( tempRoot );
+ QVERIFY( ss );
+ Calamares::GlobalStorage* gs
+ = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ QVERIFY( gs );
+
+ {
+ QDir d( tempRoot.path() );
+ d.mkdir( "etc" );
+ }
+
+ QVERIFY( !LOSHInfo::fromGlobalStorage().isValid() );
+ QVariantList outerPartition;
+ QVariantMap innerPartition;
+ innerPartition.insert( "mountPoint", "/" );
+ innerPartition.insert( "fs", "ext4" );
+ innerPartition.insert( "luksMapperName", "root" );
+ innerPartition.insert( "luksUUID", "0000" );
+ outerPartition.append( innerPartition );
+ innerPartition.remove( "mountPoint" );
+ innerPartition.insert( "fs", "linuxswap" );
+ innerPartition.insert( "luksMapperName", "swap" );
+ innerPartition.insert( "luksUuid", "0001" );
+ outerPartition.append( innerPartition );
+ gs->insert( "partitions", outerPartition );
+ QVERIFY( LOSHInfo::fromGlobalStorage().isValid() );
+
+ LOSHJob j;
+ j.setConfigurationMap( QVariantMap() );
+ auto jobresult = j.exec();
+ QVERIFY( jobresult );
+
+ {
+ QFile f( tempRoot.filePath( "etc/openswap.conf" ) );
+ QVERIFY( f.exists() );
+ QVERIFY( f.open( QIODevice::ReadOnly ) );
+ cDebug() << f.readAll();
+ }
+}
+
+
+QTEST_GUILESS_MAIN( LOSHTests )
+
+#include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/luksopenswaphookcfg/main.py b/src/modules/luksopenswaphookcfg/main.py
deleted file mode 100644
index ec09a631b..000000000
--- a/src/modules/luksopenswaphookcfg/main.py
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# === This file is part of Calamares - ===
-#
-# SPDX-FileCopyrightText: 2016 Teo Mrnjavac
-# SPDX-FileCopyrightText: 2017 Alf Gaida
-# SPDX-FileCopyrightText: 2019 Adriaan de Groot
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Calamares is Free Software: see the License-Identifier above.
-#
-
-import libcalamares
-import os.path
-
-
-import gettext
-_ = gettext.translation("calamares-python",
- localedir=libcalamares.utils.gettext_path(),
- languages=libcalamares.utils.gettext_languages(),
- fallback=True).gettext
-
-
-def pretty_name():
- return _("Configuring encrypted swap.")
-
-
-def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
- swap_outer_uuid = ""
- swap_mapper_name = ""
- mountable_keyfile_device = ""
-
- for partition in partitions:
- if partition["fs"] == "linuxswap" and "luksMapperName" in partition:
- swap_outer_uuid = partition["luksUuid"]
- swap_mapper_name = partition["luksMapperName"]
-
- elif partition["mountPoint"] == "/" and "luksMapperName" in partition:
- mountable_keyfile_device = (
- "/dev/mapper/{!s}".format(partition["luksMapperName"])
- )
-
- if not mountable_keyfile_device or not swap_outer_uuid:
- return None
-
- swap_device_path = "/dev/disk/by-uuid/{!s}".format(swap_outer_uuid)
-
- lines = []
- with open(os.path.join(root_mount_point,
- openswap_conf_path), 'r') as openswap_file:
- lines = [x.strip() for x in openswap_file.readlines()]
-
- for i in range(len(lines)):
- if lines[i].startswith("swap_device"):
- lines[i] = "swap_device={!s}".format(swap_device_path)
-
- elif lines[i].startswith("crypt_swap_name"):
- lines[i] = "crypt_swap_name={!s}".format(swap_mapper_name)
-
- elif lines[i].startswith("keyfile_device"):
- lines[i] = "keyfile_device={!s}".format(mountable_keyfile_device)
-
- elif lines[i].startswith("keyfile_filename"):
- lines[i] = "keyfile_filename=crypto_keyfile.bin"
-
- with open(os.path.join(root_mount_point,
- openswap_conf_path), 'w') as openswap_file:
- openswap_file.write("\n".join(lines) + "\n")
-
- return None
-
-
-def run():
- """
- This module sets up the openswap hook for a resumable encrypted swap.
- :return:
- """
-
- root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
- openswap_conf_path = libcalamares.job.configuration["configFilePath"]
- partitions = libcalamares.globalstorage.value("partitions")
-
- if not partitions:
- libcalamares.utils.warning("partitions is empty, {!s}".format(partitions))
- return (_("Configuration Error"),
- _("No partitions are defined for {!s} to use." ).format("luksopenswaphookcfg"))
- if not root_mount_point:
- libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point))
- return (_("Configuration Error"),
- _("No root mount point is given for {!s} to use." ).format("luksopenswaphookcfg"))
-
- openswap_conf_path = openswap_conf_path.lstrip('/')
-
- return write_openswap_conf(partitions, root_mount_point, openswap_conf_path)
diff --git a/src/modules/luksopenswaphookcfg/module.desc b/src/modules/luksopenswaphookcfg/module.desc
deleted file mode 100644
index 919a92792..000000000
--- a/src/modules/luksopenswaphookcfg/module.desc
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
----
-type: "job"
-name: "luksopenswaphookcfg"
-interface: "python"
-script: "main.py"
diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index f186b0d26..a3318d1a0 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -193,6 +193,7 @@ def mount_partition(root_mount_point, partition, partitions):
for s in btrfs_subvolumes:
if not s["subvolume"]:
continue
+ os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True)
subprocess.check_call(["btrfs", "subvolume", "create",
root_mount_point + s["subvolume"]])
if s["mountPoint"] == "/":
diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp
index a1a86294e..f7a2f66fc 100644
--- a/src/modules/netinstall/NetInstallPage.cpp
+++ b/src/modules/netinstall/NetInstallPage.cpp
@@ -15,6 +15,7 @@
#include "PackageModel.h"
#include "ui_page_netinst.h"
+#include "GlobalStorage.h"
#include "JobQueue.h"
#include "network/Manager.h"
@@ -62,4 +63,19 @@ void
NetInstallPage::onActivate()
{
ui->groupswidget->setFocus();
+
+ // The netinstallSelect global storage value can be used to make additional items selected by default
+ Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+ const QStringList selectNames = gs->value( "netinstallSelect" ).toStringList();
+ if ( !selectNames.isEmpty() )
+ {
+ m_config->model()->setSelections( selectNames );
+ }
+
+ // If NetInstallAdd is found in global storage, add those items to the tree
+ const QVariantList groups = gs->value( "netinstallAdd" ).toList();
+ if ( !groups.isEmpty() )
+ {
+ m_config->model()->appendModelData( groups );
+ }
}
diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index d4887b6c2..256a77afd 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -14,6 +14,43 @@
#include "utils/Variant.h"
#include "utils/Yaml.h"
+/// Recursive helper for setSelections()
+static void
+setSelections( const QStringList& selectNames, PackageTreeItem* item )
+{
+ for ( int i = 0; i < item->childCount(); i++ )
+ {
+ auto* child = item->child( i );
+ setSelections( selectNames, child );
+ }
+ if ( item->isGroup() && selectNames.contains( item->name() ) )
+ {
+ item->setSelected( Qt::CheckState::Checked );
+ }
+}
+
+/** @brief Collects all the "source" values from @p groupList
+ *
+ * Iterates over @p groupList and returns all nonempty "source"
+ * values from the maps.
+ *
+ */
+static QStringList
+collectSources( const QVariantList& groupList )
+{
+ QStringList sources;
+ for ( const QVariant& group : groupList )
+ {
+ QVariantMap groupMap = group.toMap();
+ if ( !groupMap[ "source" ].toString().isEmpty() )
+ {
+ sources.append( groupMap[ "source" ].toString() );
+ }
+ }
+
+ return sources;
+}
+
PackageModel::PackageModel( QObject* parent )
: QAbstractItemModel( parent )
{
@@ -170,6 +207,15 @@ PackageModel::headerData( int section, Qt::Orientation orientation, int role ) c
return QVariant();
}
+void
+PackageModel::setSelections( const QStringList& selectNames )
+{
+ if ( m_rootItem )
+ {
+ ::setSelections( selectNames, m_rootItem );
+ }
+}
+
PackageTreeItem::List
PackageModel::getPackages() const
{
@@ -303,9 +349,43 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
void
PackageModel::setupModelData( const QVariantList& l )
{
- emit beginResetModel();
+ Q_EMIT beginResetModel();
delete m_rootItem;
m_rootItem = new PackageTreeItem();
setupModelData( l, m_rootItem );
- emit endResetModel();
+ Q_EMIT endResetModel();
+}
+
+void
+PackageModel::appendModelData( const QVariantList& groupList )
+{
+ if ( m_rootItem )
+ {
+ Q_EMIT beginResetModel();
+
+ const QStringList sources = collectSources( groupList );
+
+ if ( !sources.isEmpty() )
+ {
+ // Prune any existing data from the same source
+ QList< int > removeList;
+ for ( int i = 0; i < m_rootItem->childCount(); i++ )
+ {
+ PackageTreeItem* child = m_rootItem->child( i );
+ if ( sources.contains( child->source() ) )
+ {
+ removeList.insert( 0, i );
+ }
+ }
+ for ( const int& item : qAsConst( removeList ) )
+ {
+ m_rootItem->removeChild( item );
+ }
+ }
+
+ // Add the new data to the model
+ setupModelData( groupList, m_rootItem );
+
+ Q_EMIT endResetModel();
+ }
}
diff --git a/src/modules/netinstall/PackageModel.h b/src/modules/netinstall/PackageModel.h
index 998f42c38..e97359a46 100644
--- a/src/modules/netinstall/PackageModel.h
+++ b/src/modules/netinstall/PackageModel.h
@@ -54,9 +54,33 @@ public:
int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
int columnCount( const QModelIndex& parent = QModelIndex() ) const override;
+ /** @brief Sets the checked flag on matching groups in the tree
+ *
+ * Recursively traverses the tree pointed to by m_rootItem and
+ * checks if a group name matches any of the items in @p selectNames.
+ * If a match is found, set check the box for that group and it's children.
+ *
+ * Individual packages will not be matched.
+ *
+ */
+ void setSelections( const QStringList& selectNames );
+
PackageTreeItem::List getPackages() const;
PackageTreeItem::List getItemPackages( PackageTreeItem* item ) const;
+ /** @brief Appends groups to the tree
+ *
+ * Uses the data from @p groupList to add elements to the
+ * existing tree that m_rootItem points to. If m_rootItem
+ * is not valid, it does nothing
+ *
+ * Before adding anything to the model, it ensures that there
+ * is no existing data from the same source. If there is, that
+ * data is pruned first
+ *
+ */
+ void appendModelData( const QVariantList& groupList );
+
private:
friend class ItemTests;
diff --git a/src/modules/netinstall/PackageTreeItem.cpp b/src/modules/netinstall/PackageTreeItem.cpp
index b30cdf915..5841606c4 100644
--- a/src/modules/netinstall/PackageTreeItem.cpp
+++ b/src/modules/netinstall/PackageTreeItem.cpp
@@ -70,6 +70,7 @@ PackageTreeItem::PackageTreeItem( const QVariantMap& groupData, GroupTag&& paren
, m_description( CalamaresUtils::getString( groupData, "description" ) )
, m_preScript( CalamaresUtils::getString( groupData, "pre-install" ) )
, m_postScript( CalamaresUtils::getString( groupData, "post-install" ) )
+ , m_source( CalamaresUtils::getString( groupData, "source" ) )
, m_isGroup( true )
, m_isCritical( parentCriticality( groupData, parent.parent ) )
, m_isHidden( CalamaresUtils::getBool( groupData, "hidden", false ) )
@@ -248,6 +249,19 @@ PackageTreeItem::setChildrenSelected( Qt::CheckState isSelected )
}
}
+void
+PackageTreeItem::removeChild( int row )
+{
+ if ( 0 <= row && row < m_childItems.count() )
+ {
+ m_childItems.removeAt( row );
+ }
+ else
+ {
+ cWarning() << "Attempt to remove invalid child in removeChild() at row " << row;
+ }
+}
+
int
PackageTreeItem::type() const
{
diff --git a/src/modules/netinstall/PackageTreeItem.h b/src/modules/netinstall/PackageTreeItem.h
index c04b9a21d..2a0fca83e 100644
--- a/src/modules/netinstall/PackageTreeItem.h
+++ b/src/modules/netinstall/PackageTreeItem.h
@@ -56,6 +56,7 @@ public:
QString description() const { return m_description; }
QString preScript() const { return m_preScript; }
QString postScript() const { return m_postScript; }
+ QString source() const { return m_source; }
/** @brief Is this item a group-item?
*
@@ -124,6 +125,8 @@ public:
void setSelected( Qt::CheckState isSelected );
void setChildrenSelected( Qt::CheckState isSelected );
+ void removeChild( int row );
+
/** @brief Update selectedness based on the children's states
*
* This only makes sense for groups, which might have packages
@@ -157,6 +160,7 @@ private:
QString m_description;
QString m_preScript;
QString m_postScript;
+ QString m_source;
bool m_isGroup = false;
bool m_isCritical = false;
bool m_isHidden = false;
diff --git a/src/modules/netinstall/Tests.cpp b/src/modules/netinstall/Tests.cpp
index df5d5ad60..6b1db020c 100644
--- a/src/modules/netinstall/Tests.cpp
+++ b/src/modules/netinstall/Tests.cpp
@@ -410,7 +410,7 @@ ItemTests::testUrlFallback()
QEventLoop loop;
connect( &c, &Config::statusReady, &loop, &QEventLoop::quit );
QSignalSpy spy( &c, &Config::statusReady );
- QTimer::singleShot( std::chrono::seconds(1), &loop, &QEventLoop::quit );
+ QTimer::singleShot( std::chrono::seconds( 1 ), &loop, &QEventLoop::quit );
loop.exec();
// Check it didn't time out
diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py
index 0ee47c1aa..807fdf613 100644
--- a/src/modules/networkcfg/main.py
+++ b/src/modules/networkcfg/main.py
@@ -73,12 +73,12 @@ def replace_username(nm_config_filename, live_user, target_user):
if not os.path.exists(nm_config_filename):
return
- with open(nm_config_filename, "r") as network_conf:
+ with open(nm_config_filename, "r", encoding="UTF-8") as network_conf:
text = network_conf.readlines()
live_permissions = 'permissions=user:{}:;'.format(live_user)
target_permissions = 'permissions=user:{}:;\n'.format(target_user)
- with open(nm_config_filename, "w") as network_conf:
+ with open(nm_config_filename, "w", encoding="UTF-8") as network_conf:
for line in text:
if live_permissions in line:
line = target_permissions
diff --git a/src/modules/packagechooser/Config.cpp b/src/modules/packagechooser/Config.cpp
index 5c0db5d91..491fe5c25 100644
--- a/src/modules/packagechooser/Config.cpp
+++ b/src/modules/packagechooser/Config.cpp
@@ -27,6 +27,29 @@
#include "utils/Logger.h"
#include "utils/Variant.h"
+/** @brief This removes any values from @p groups that match @p source
+ *
+ * This is used to remove duplicates from the netinstallAdd structure
+ * It iterates over @p groups and for each map in the list, if the
+ * "source" element matches @p source, it is removed from the returned
+ * list.
+ */
+static QVariantList
+pruneNetinstallAdd( const QString& source, const QVariant& groups )
+{
+ QVariantList newGroupList;
+ const QVariantList groupList = groups.toList();
+ for ( const QVariant& group : groupList )
+ {
+ QVariantMap groupMap = group.toMap();
+ if ( groupMap.value( "source", "" ).toString() != source )
+ {
+ newGroupList.append( groupMap );
+ }
+ }
+ return newGroupList;
+}
+
const NamedEnumTable< PackageChooserMode >&
packageChooserModeNames()
{
@@ -55,6 +78,8 @@ PackageChooserMethodNames()
{ "custom", PackageChooserMethod::Legacy },
{ "contextualprocess", PackageChooserMethod::Legacy },
{ "packages", PackageChooserMethod::Packages },
+ { "netinstall-add", PackageChooserMethod::NetAdd },
+ { "netinstall-select", PackageChooserMethod::NetSelect },
};
return names;
}
@@ -121,6 +146,47 @@ Config::updateGlobalStorage( const QStringList& selected ) const
CalamaresUtils::Packages::setGSPackageAdditions(
Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames );
}
+ else if ( m_method == PackageChooserMethod::NetAdd )
+ {
+ QVariantList netinstallDataList = m_model->getNetinstallDataForNames( selected );
+ if ( netinstallDataList.isEmpty() )
+ {
+ cWarning() << "No netinstall information found for " << selected;
+ }
+ else
+ {
+ // If an earlier packagechooser instance added this data to global storage, combine them
+ auto* gs = Calamares::JobQueue::instance()->globalStorage();
+ if ( gs->contains( "netinstallAdd" ) )
+ {
+ netinstallDataList
+ += pruneNetinstallAdd( QStringLiteral( "packageChooser" ), gs->value( "netinstallAdd" ) );
+ }
+ gs->insert( "netinstallAdd", netinstallDataList );
+ }
+ }
+ else if ( m_method == PackageChooserMethod::NetSelect )
+ {
+ cDebug() << m_defaultId << "groups to select in netinstall" << selected;
+ QStringList newSelected = selected;
+ auto* gs = Calamares::JobQueue::instance()->globalStorage();
+
+ // If an earlier packagechooser instance added this data to global storage, combine them
+ if ( gs->contains( "netinstallSelect" ) )
+ {
+ auto selectedOrig = gs->value( "netinstallSelect" );
+ if ( selectedOrig.canConvert( QVariant::StringList ) )
+ {
+ newSelected += selectedOrig.toStringList();
+ }
+ else
+ {
+ cWarning() << "Invalid NetinstallSelect data in global storage. Earlier selections purged";
+ }
+ gs->remove( "netinstallSelect" );
+ }
+ gs->insert( "netinstallSelect", newSelected );
+ }
else
{
cWarning() << "Unknown packagechooser method" << smash( m_method );
diff --git a/src/modules/packagechooser/Config.h b/src/modules/packagechooser/Config.h
index 32f1e8b57..b04b1c30b 100644
--- a/src/modules/packagechooser/Config.h
+++ b/src/modules/packagechooser/Config.h
@@ -33,6 +33,8 @@ enum class PackageChooserMethod
{
Legacy, // use contextualprocess or other custom
Packages, // use the packages module
+ NetAdd, // adds packages to the netinstall module
+ NetSelect, // makes selections in the netinstall module
};
const NamedEnumTable< PackageChooserMethod >& PackageChooserMethodNames();
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index 8a0b13e51..f1d1184ad 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -15,6 +15,16 @@
#include
+/** @brief A wrapper for CalamaresUtils::getSubMap that excludes the success param
+ */
+static QVariantMap
+getSubMap( const QVariantMap& map, const QString& key )
+{
+ bool success;
+
+ return CalamaresUtils::getSubMap( map, key, success );
+}
+
static QPixmap
loadScreenshot( const QString& path )
{
@@ -51,12 +61,13 @@ PackageItem::PackageItem( const QString& a_id,
{
}
-PackageItem::PackageItem::PackageItem( const QVariantMap& item_map )
+PackageItem::PackageItem( const QVariantMap& item_map )
: id( CalamaresUtils::getString( item_map, "id" ) )
, name( CalamaresUtils::Locale::TranslatedString( item_map, "name" ) )
, description( CalamaresUtils::Locale::TranslatedString( item_map, "description" ) )
, screenshot( loadScreenshot( CalamaresUtils::getString( item_map, "screenshot" ) ) )
, packageNames( CalamaresUtils::getStringList( item_map, "packages" ) )
+ , netinstallData( getSubMap( item_map, "netinstall" ) )
{
if ( name.isEmpty() && id.isEmpty() )
{
@@ -125,6 +136,25 @@ PackageListModel::getInstallPackagesForNames( const QStringList& ids ) const
return l;
}
+QVariantList
+PackageListModel::getNetinstallDataForNames( const QStringList& ids ) const
+{
+ QVariantList l;
+ for ( auto& p : m_packages )
+ {
+ if ( ids.contains( p.id ) )
+ {
+ if ( !p.netinstallData.isEmpty() )
+ {
+ QVariantMap newData = p.netinstallData;
+ newData[ "source" ] = QStringLiteral( "packageChooser" );
+ l.append( newData );
+ }
+ }
+ }
+ return l;
+}
+
int
PackageListModel::rowCount( const QModelIndex& index ) const
{
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index 71003197d..18682a121 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -26,6 +26,7 @@ struct PackageItem
CalamaresUtils::Locale::TranslatedString description;
QPixmap screenshot;
QStringList packageNames;
+ QVariantMap netinstallData;
/// @brief Create blank PackageItem
PackageItem();
@@ -111,6 +112,14 @@ public:
*/
QStringList getInstallPackagesForNames( const QStringList& ids ) const;
+ /** @brief Does a name lookup (based on id) and returns the netinstall data
+ *
+ * If there is a package with an id in @p ids, returns their netinstall data
+ *
+ * returns a list of netinstall data or an emply list if none is found
+ */
+ QVariantList getNetinstallDataForNames( const QStringList& ids ) const;
+
enum Roles : int
{
NameRole = Qt::DisplayRole,
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index 6461376bf..1fa5187ae 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -33,6 +33,15 @@ mode: required
# in the `exec` section. These package settings will then be handed
# off to whatever package manager is configured there.
#
+# - "netinstall-select"
+# When this is set, the id(s) selected are passed to the netinstall module.
+# Any id that matches a group name in that module is set to checked
+#
+# - "netinstall-add"
+# With this method, the packagechooser module is used to add groups to the
+# netinstall module. For this to hav=e any effect. You must set netinstall,
+# which is described below.
+#
# There is no need to put this module in the `exec` section. There
# are no jobs that this module provides. You should put **other**
# modules, either *contextualprocess* or *packages* or some custom
@@ -101,13 +110,19 @@ labels:
# an additional attempt is made to load the image from the **branding**
# directory.
#
-# The following field is **optional** for an item:
+# The following fields are **optional** for an item:
#
# - *packages* :
# List of package names for the product. If using the *method*
# "packages", consider this item mandatory (because otherwise
# selecting the item would install no packages).
#
+# - *netinstall* :
+# The data in this field should follow the format of a group
+# from the netinstall module documented in
+# src/modules/netinstall/netinstall.conf. This is only used
+# when method is set to "netinstall-add"
+#
# # AppData Items #
#
# For data provided by AppData XML: the item has an *appdata*
diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py
index 10371777e..59777cedb 100644
--- a/src/modules/packages/main.py
+++ b/src/modules/packages/main.py
@@ -382,7 +382,7 @@ class PMPacman(PackageManager):
def line_cb(line):
if line.startswith(":: "):
- self.in_package_changes = "package changes" in line
+ self.in_package_changes = "package" in line or "hooks" in line
else:
if self.in_package_changes and line.endswith("...\n"):
# Update the message, untranslated; do not change the
@@ -392,7 +392,7 @@ class PMPacman(PackageManager):
global custom_status_message
custom_status_message = "pacman: " + line.strip()
libcalamares.job.setprogress(self.progress_fraction)
- libcalamares.utils.debug(line)
+ libcalamares.utils.debug(line)
self.in_package_changes = False
self.line_cb = line_cb
@@ -444,8 +444,12 @@ class PMPacman(PackageManager):
else:
command.append("-S")
+ # Don't ask for user intervention, take the default action
command.append("--noconfirm")
+ # Don't report download progress for each file
+ command.append("--noprogressbar")
+
if self.pacman_needed_only is True:
command.append("--needed")
diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp
index 155622570..550e17460 100644
--- a/src/modules/partition/Config.cpp
+++ b/src/modules/partition/Config.cpp
@@ -345,6 +345,11 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
if ( !m_swapChoices.contains( m_initialSwapChoice ) )
{
cWarning() << "Configuration for *initialSwapChoice* is not one of the *userSwapChoices*";
+ if ( nameFound )
+ {
+ cWarning() << Logger::SubEntry << "Choice" << swapChoiceNames().find( m_initialSwapChoice ) << "added.";
+ m_swapChoices.insert( m_initialSwapChoice );
+ }
m_initialSwapChoice = pickOne( m_swapChoices );
}
setSwapChoice( m_initialSwapChoice );
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index a6b5e1dd8..5e8bf2ef0 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -146,15 +146,12 @@ modeDescription( Config::InstallChoice choice )
case Config::InstallChoice::Alongside:
return QCoreApplication::translate( context, "Install %1 alongside another operating system." )
.arg( branding->shortVersionedName() );
- break;
case Config::InstallChoice::Erase:
return QCoreApplication::translate( context, "Erase disk and install %1." )
.arg( branding->shortVersionedName() );
- break;
case Config::InstallChoice::Replace:
return QCoreApplication::translate( context, "Replace a partition with %1." )
.arg( branding->shortVersionedName() );
- break;
case Config::InstallChoice::NoChoice:
case Config::InstallChoice::Manual:
return QCoreApplication::translate( context, "Manual partitioning." );
@@ -187,21 +184,18 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
- break;
case Config::Erase:
return QCoreApplication::translate( context,
"Erase disk %2 (%3) and install %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
- break;
case Config::Replace:
return QCoreApplication::translate(
context, "Replace a partition on disk %2 (%3) with %1." )
.arg( branding->shortVersionedName() )
.arg( info.deviceNode )
.arg( info.deviceName );
- break;
case Config::NoChoice:
case Config::Manual:
return QCoreApplication::translate(
@@ -558,7 +552,7 @@ PartitionViewStep::onLeave()
if ( !okSize )
{
cDebug() << o << "ESP too small";
- const auto atLeastBytes = PartUtils::efiFilesystemMinimumSize();
+ const qint64 atLeastBytes = static_cast< qint64 >( PartUtils::efiFilesystemMinimumSize() );
const auto atLeastMiB = CalamaresUtils::BytesToMiB( atLeastBytes );
description.append( ' ' );
description.append( tr( "The filesystem must be at least %1 MiB in size." ).arg( atLeastMiB ) );
@@ -681,11 +675,15 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
// because it could take a while. Then when it's done, we can set up the widgets
// and remove the spinner.
m_future = new QFutureWatcher< void >();
- connect( m_future, &QFutureWatcher< void >::finished, this, [this] {
- continueLoading();
- this->m_future->deleteLater();
- this->m_future = nullptr;
- } );
+ connect( m_future,
+ &QFutureWatcher< void >::finished,
+ this,
+ [ this ]
+ {
+ continueLoading();
+ this->m_future->deleteLater();
+ this->m_future = nullptr;
+ } );
QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
m_future->setFuture( future );
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index c7de12e88..adbbddd68 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -11,6 +11,7 @@
#include "DeviceList.h"
#include "partition/PartitionIterator.h"
+#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include
@@ -40,16 +41,30 @@ hasRootPartition( Device* device )
return false;
}
+/** @brief Check if @p path holds an iso9660 filesystem
+ *
+ * The @p path should point to a device; blkid is used to check the FS type.
+ */
static bool
blkIdCheckIso9660( const QString& path )
{
- QProcess blkid;
- blkid.start( "blkid", { path } );
- blkid.waitForFinished();
- QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() );
- return output.contains( "iso9660" );
+ // If blkid fails, there's no output, but we don't care
+ auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) );
+ return r.getOutput().contains( "iso9660" );
}
+/// @brief Convenience to check if @p partition holds an iso9660 filesystem
+static bool
+blkIdCheckIso9660P( const Partition* partition )
+{
+ return blkIdCheckIso9660( partition->partitionPath() );
+}
+
+/** @brief Check if the @p device is an iso9660 device
+ *
+ * An iso9660 device is **probably** a CD-ROM. If the device holds an
+ * iso9660 FS, or any of its partitions do, then we call it an iso9660 device.
+ */
static bool
isIso9660( const Device* device )
{
@@ -65,13 +80,8 @@ isIso9660( const Device* device )
if ( device->partitionTable() && !device->partitionTable()->children().isEmpty() )
{
- for ( const Partition* partition : device->partitionTable()->children() )
- {
- if ( blkIdCheckIso9660( partition->partitionPath() ) )
- {
- return true;
- }
- }
+ const auto& p = device->partitionTable()->children();
+ return std::any_of( p.cbegin(), p.cend(), blkIdCheckIso9660P );
}
return false;
}
diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 33aae20c0..6959ac9c2 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -8,9 +8,10 @@
* Calamares is Free Software: see the License-Identifier above.
*
*/
-#include "core/DeviceModel.h"
+#include "DeviceModel.h"
#include "core/PartitionModel.h"
+#include "core/SizeUtils.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
@@ -18,9 +19,6 @@
// KPMcore
#include
-// KF5
-#include
-
#include
#include
@@ -30,9 +28,9 @@
static void
sortDevices( DeviceModel::DeviceList& l )
{
- std::sort( l.begin(), l.end(), []( const Device* dev1, const Device* dev2 ) {
- return dev1->deviceNode() < dev2->deviceNode();
- } );
+ std::sort( l.begin(),
+ l.end(),
+ []( const Device* dev1, const Device* dev2 ) { return dev1->deviceNode() < dev2->deviceNode(); } );
}
DeviceModel::DeviceModel( QObject* parent )
@@ -83,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const
//: device[name] - size[number] (device-node[name])
return tr( "%1 - %2 (%3)" )
.arg( device->name() )
- .arg( KFormat().formatByteSize( device->capacity() ) )
+ .arg( formatByteSize( device->capacity() ) )
.arg( device->deviceNode() );
}
else
diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp
index ed105e28b..d5086ef21 100644
--- a/src/modules/partition/core/KPMHelpers.cpp
+++ b/src/modules/partition/core/KPMHelpers.cpp
@@ -15,8 +15,8 @@
#include "partition/PartitionIterator.h"
#include "utils/Logger.h"
+#include "utils/String.h"
-// KPMcore
#include
#include
#include
@@ -127,4 +127,23 @@ clonePartition( Device* device, Partition* partition )
partition->activeFlags() );
}
+Calamares::JobResult
+execute( Operation& operation, const QString& failureMessage )
+{
+ operation.setStatus( Operation::StatusRunning );
+
+ Report report( nullptr );
+ if ( operation.execute( report ) )
+ {
+ return Calamares::JobResult::ok();
+ }
+
+ // Remove the === lines from the report by trimming them to empty
+ QStringList l = report.toText().split( '\n' );
+ std::for_each( l.begin(), l.end(), []( QString& s ) { CalamaresUtils::removeLeading( s, '=' ); } );
+
+ return Calamares::JobResult::error( failureMessage, l.join( '\n' ) );
+}
+
+
} // namespace KPMHelpers
diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index 89a019f6c..2f867bc25 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -11,11 +11,13 @@
#ifndef KPMHELPERS_H
#define KPMHELPERS_H
-// KPMcore
+#include "Job.h"
+
#include
#include
+#include
+#include
-// Qt
#include
#include
@@ -72,6 +74,24 @@ Partition* createNewEncryptedPartition( PartitionNode* parent,
Partition* clonePartition( Device* device, Partition* partition );
+/** @brief Return a result for an @p operation
+ *
+ * Executes the operation, and if successful, returns a success result.
+ * Otherwise returns an error using @p failureMessage as the primary part
+ * of the error, and details obtained from the operation.
+ */
+Calamares::JobResult execute( Operation& operation, const QString& failureMessage );
+/** @brief Return a result for an @p operation
+ *
+ * It's acceptable to use an rvalue: the operation-running is the effect
+ * you're interested in, rather than keeping the temporary around.
+ */
+static inline Calamares::JobResult
+execute( Operation&& operation, const QString& failureMessage )
+{
+ return execute( operation, failureMessage );
+}
+
} // namespace KPMHelpers
#endif /* KPMHELPERS_H */
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 507330a80..cb7c8a01d 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -451,6 +451,8 @@ isEfiFilesystemSuitableType( const Partition* candidate )
{
auto type = candidate->fileSystem().type();
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" )
switch ( type )
{
case FileSystem::Type::Fat32:
@@ -465,6 +467,7 @@ isEfiFilesystemSuitableType( const Partition* candidate )
cWarning() << "EFI boot partition must be FAT32";
return false;
}
+ QT_WARNING_POP
}
bool
@@ -526,14 +529,15 @@ efiFilesystemMinimumSize()
{
using CalamaresUtils::Units::operator""_MiB;
- auto uefisys_part_sizeB = 300_MiB;
+ size_t uefisys_part_sizeB = 300_MiB;
// The default can be overridden; the key used here comes
// from the partition module Config.cpp
auto* gs = Calamares::JobQueue::instance()->globalStorage();
if ( gs->contains( "efiSystemPartitionSize_i" ) )
{
- uefisys_part_sizeB = gs->value( "efiSystemPartitionSize_i" ).toLongLong();
+ qint64 v = gs->value( "efiSystemPartitionSize_i" ).toLongLong();
+ uefisys_part_sizeB = v > 0 ? static_cast< size_t >( v ) : 0;
}
// There is a lower limit of what can be configured
if ( uefisys_part_sizeB < 32_MiB )
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 8514bbe2c..a56446a39 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -71,15 +71,15 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )
// Allow for a fudge factor
- suggestedSwapSizeB *= overestimationFactor;
+ suggestedSwapSizeB = qRound64( suggestedSwapSizeB * overestimationFactor );
// don't use more than 10% of available space
if ( !ensureSuspendToDisk )
{
- suggestedSwapSizeB = qMin( suggestedSwapSizeB, qint64( 0.10 * availableSpaceB ) );
+ suggestedSwapSizeB = qMin( suggestedSwapSizeB, availableSpaceB / 10 /* 10% is 0.1 */ );
}
- cDebug() << "Suggested swap size:" << suggestedSwapSizeB / 1024. / 1024. / 1024. << "GiB";
+ cDebug() << "Suggested swap size:" << CalamaresUtils::BytesToGiB( suggestedSwapSizeB ) << "GiB";
return suggestedSwapSizeB;
}
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 16e5a7ea1..989327ef0 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -262,11 +262,9 @@ PartitionCoreModule::doInit()
// Gives ownership of the Device* to the DeviceInfo object
auto deviceInfo = new DeviceInfo( device );
m_deviceInfos << deviceInfo;
- cDebug() << Logger::SubEntry
- << device->deviceNode()
- << device->capacity()
- << Logger::RedactedName( "DevName", device->name() )
- << Logger::RedactedName( "DevNamePretty", device->prettyName() );
+ cDebug() << Logger::SubEntry << device->deviceNode() << device->capacity()
+ << Logger::RedactedName( "DevName", device->name() )
+ << Logger::RedactedName( "DevNamePretty", device->prettyName() );
}
else
{
@@ -685,9 +683,8 @@ PartitionCoreModule::lvmPVs() const
bool
PartitionCoreModule::hasVGwithThisName( const QString& name ) const
{
- auto condition = [name]( DeviceInfo* d ) {
- return dynamic_cast< LvmDevice* >( d->device.data() ) && d->device.data()->name() == name;
- };
+ auto condition = [ name ]( DeviceInfo* d )
+ { return dynamic_cast< LvmDevice* >( d->device.data() ) && d->device.data()->name() == name; };
return std::find_if( m_deviceInfos.begin(), m_deviceInfos.end(), condition ) != m_deviceInfos.end();
}
@@ -695,7 +692,8 @@ PartitionCoreModule::hasVGwithThisName( const QString& name ) const
bool
PartitionCoreModule::isInVG( const Partition* partition ) const
{
- auto condition = [partition]( DeviceInfo* d ) {
+ auto condition = [ partition ]( DeviceInfo* d )
+ {
LvmDevice* vg = dynamic_cast< LvmDevice* >( d->device.data() );
return vg && vg->physicalVolumes().contains( partition );
};
@@ -964,9 +962,9 @@ PartitionCoreModule::layoutApply( Device* dev,
const QString boot = QStringLiteral( "/boot" );
const QString root = QStringLiteral( "/" );
const auto is_boot
- = [&]( Partition* p ) -> bool { return PartitionInfo::mountPoint( p ) == boot || p->mountPoint() == boot; };
+ = [ & ]( Partition* p ) -> bool { return PartitionInfo::mountPoint( p ) == boot || p->mountPoint() == boot; };
const auto is_root
- = [&]( Partition* p ) -> bool { return PartitionInfo::mountPoint( p ) == root || p->mountPoint() == root; };
+ = [ & ]( Partition* p ) -> bool { return PartitionInfo::mountPoint( p ) == root || p->mountPoint() == root; };
const bool separate_boot_partition
= std::find_if( partList.constBegin(), partList.constEnd(), is_boot ) != partList.constEnd();
@@ -1089,10 +1087,14 @@ void
PartitionCoreModule::asyncRevertDevice( Device* dev, std::function< void() > callback )
{
QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
- connect( watcher, &QFutureWatcher< void >::finished, this, [watcher, callback] {
- callback();
- watcher->deleteLater();
- } );
+ connect( watcher,
+ &QFutureWatcher< void >::finished,
+ this,
+ [ watcher, callback ]
+ {
+ callback();
+ watcher->deleteLater();
+ } );
QFuture< void > future = QtConcurrent::run( this, &PartitionCoreModule::revertDevice, dev, true );
watcher->setFuture( future );
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index f60952643..765d9fffa 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -141,6 +141,8 @@ void
PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
{
using FileSystem = FileSystem::Type;
+ QT_WARNING_PUSH
+ QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" )
switch ( defaultFsType )
{
case FileSystem::Unknown:
@@ -196,6 +198,7 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType )
<< "Using ext4 instead.";
defaultFsType = FileSystem::Ext4;
}
+ QT_WARNING_POP
m_defaultFsType = defaultFsType;
}
@@ -280,7 +283,7 @@ PartitionLayout::createPartitions( Device* dev,
}
}
- auto correctFS = [d = m_defaultFsType]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
+ auto correctFS = [ d = m_defaultFsType ]( FileSystem::Type t ) { return t == FileSystem::Type::Unknown ? d : t; };
// Create the partitions.
currentSector = firstSector;
diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp
index e310eee5e..19dbcd076 100644
--- a/src/modules/partition/core/PartitionModel.cpp
+++ b/src/modules/partition/core/PartitionModel.cpp
@@ -8,11 +8,12 @@
*
*/
-#include "core/PartitionModel.h"
+#include "PartitionModel.h"
#include "core/ColorUtils.h"
#include "core/KPMHelpers.h"
#include "core/PartitionInfo.h"
+#include "core/SizeUtils.h"
#include "partition/FileSystem.h"
#include "partition/PartitionQuery.h"
@@ -24,9 +25,6 @@
#include
#include
-// KF5
-#include
-
// Qt
#include
@@ -178,7 +176,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
if ( col == SizeColumn )
{
qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
- return KFormat().formatByteSize( size );
+ return formatByteSize( size );
}
cDebug() << "Unknown column" << col;
return QVariant();
@@ -210,7 +208,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const
QString prettyFileSystem
= CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() );
qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize();
- QString prettySize = KFormat().formatByteSize( size );
+ QString prettySize = formatByteSize( size );
return QVariant( name + " " + prettyFileSystem + " " + prettySize );
}
case SizeRole:
diff --git a/src/modules/partition/core/SizeUtils.h b/src/modules/partition/core/SizeUtils.h
new file mode 100644
index 000000000..155cbd923
--- /dev/null
+++ b/src/modules/partition/core/SizeUtils.h
@@ -0,0 +1,28 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef PARTITION_CORE_SIZEUTILS_H
+#define PARTITION_CORE_SIZEUTILS_H
+
+#include
+
+/** @brief Helper function for printing sizes consistently.
+ *
+ * Most of Calamares uses a qint64 for partition sizes, so use that
+ * parameter type. However, the human-visible formatting doesn't need
+ * to bother with one-byte accuracy (and anyway, a double has at least 50 bits
+ * at which point we're printing giga (or gibi) bytes).
+ */
+static inline QString
+formatByteSize( qint64 sizeValue )
+{
+ return Capacity::formatByteSize( static_cast< double >( sizeValue ) );
+}
+
+#endif // PARTITION_CORE_SIZEUTILS_H
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 9226eb3b6..588c1b643 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -176,10 +176,14 @@ ChoicePage::init( PartitionCoreModule* core )
// We need to do this because a PCM revert invalidates the deviceModel.
- connect( core, &PartitionCoreModule::reverted, this, [=] {
- setModelToComboBox( m_drivesCombo, core->deviceModel() );
- m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
- } );
+ connect( core,
+ &PartitionCoreModule::reverted,
+ this,
+ [ = ]
+ {
+ setModelToComboBox( m_drivesCombo, core->deviceModel() );
+ m_drivesCombo->setCurrentIndex( m_lastSelectedDeviceIndex );
+ } );
setModelToComboBox( m_drivesCombo, core->deviceModel() );
connect( m_drivesCombo, qOverload< int >( &QComboBox::currentIndexChanged ), this, &ChoicePage::applyDeviceChoice );
@@ -303,26 +307,30 @@ ChoicePage::setupChoices()
#else
auto buttonSignal = &QButtonGroup::idToggled;
#endif
- connect( m_grp, buttonSignal, this, [this]( int id, bool checked ) {
- if ( checked ) // An action was picked.
- {
- m_config->setInstallChoice( id );
- updateNextEnabled();
+ connect( m_grp,
+ buttonSignal,
+ this,
+ [ this ]( int id, bool checked )
+ {
+ if ( checked ) // An action was picked.
+ {
+ m_config->setInstallChoice( id );
+ updateNextEnabled();
- Q_EMIT actionChosen();
- }
- else // An action was unpicked, either on its own or because of another selection.
- {
- if ( m_grp->checkedButton() == nullptr ) // If no other action is chosen, we must
- {
- // set m_choice to NoChoice and reset previews.
- m_config->setInstallChoice( InstallChoice::NoChoice );
- updateNextEnabled();
+ Q_EMIT actionChosen();
+ }
+ else // An action was unpicked, either on its own or because of another selection.
+ {
+ if ( m_grp->checkedButton() == nullptr ) // If no other action is chosen, we must
+ {
+ // set m_choice to NoChoice and reset previews.
+ m_config->setInstallChoice( InstallChoice::NoChoice );
+ updateNextEnabled();
- Q_EMIT actionChosen();
- }
- }
- } );
+ Q_EMIT actionChosen();
+ }
+ }
+ } );
m_rightLayout->setStretchFactor( m_itemsLayout, 1 );
m_rightLayout->setStretchFactor( m_previewBeforeFrame, 0 );
@@ -401,11 +409,13 @@ ChoicePage::applyDeviceChoice()
if ( m_core->isDirty() )
{
ScanningDialog::run(
- QtConcurrent::run( [=] {
- QMutexLocker locker( &m_coreMutex );
- m_core->revertAllDevices();
- } ),
- [this] { continueApplyDeviceChoice(); },
+ QtConcurrent::run(
+ [ = ]
+ {
+ QMutexLocker locker( &m_coreMutex );
+ m_core->revertAllDevices();
+ } ),
+ [ this ] { continueApplyDeviceChoice(); },
this );
}
else
@@ -493,11 +503,14 @@ ChoicePage::applyActionChoice( InstallChoice choice )
if ( m_core->isDirty() )
{
ScanningDialog::run(
- QtConcurrent::run( [=] {
- QMutexLocker locker( &m_coreMutex );
- m_core->revertDevice( selectedDevice() );
- } ),
- [=] {
+ QtConcurrent::run(
+ [ = ]
+ {
+ QMutexLocker locker( &m_coreMutex );
+ m_core->revertDevice( selectedDevice() );
+ } ),
+ [ = ]
+ {
PartitionActions::doAutopartition( m_core, selectedDevice(), options );
Q_EMIT deviceChosen();
},
@@ -514,10 +527,12 @@ ChoicePage::applyActionChoice( InstallChoice choice )
if ( m_core->isDirty() )
{
ScanningDialog::run(
- QtConcurrent::run( [=] {
- QMutexLocker locker( &m_coreMutex );
- m_core->revertDevice( selectedDevice() );
- } ),
+ QtConcurrent::run(
+ [ = ]
+ {
+ QMutexLocker locker( &m_coreMutex );
+ m_core->revertDevice( selectedDevice() );
+ } ),
[] {},
this );
}
@@ -532,11 +547,14 @@ ChoicePage::applyActionChoice( InstallChoice choice )
if ( m_core->isDirty() )
{
ScanningDialog::run(
- QtConcurrent::run( [=] {
- QMutexLocker locker( &m_coreMutex );
- m_core->revertDevice( selectedDevice() );
- } ),
- [this] {
+ QtConcurrent::run(
+ [ = ]
+ {
+ QMutexLocker locker( &m_coreMutex );
+ m_core->revertDevice( selectedDevice() );
+ } ),
+ [ this ]
+ {
// We need to reupdate after reverting because the splitter widget is
// not a true view.
updateActionChoicePreview( m_config->installChoice() );
@@ -772,7 +790,8 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
ScanningDialog::run(
QtConcurrent::run(
- [this, current, homePartitionPath]( bool doReuseHomePartition ) {
+ [ this, current, homePartitionPath ]( bool doReuseHomePartition )
+ {
QMutexLocker locker( &m_coreMutex );
if ( m_core->isDirty() )
@@ -853,7 +872,8 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
}
},
m_reuseHomeCheckBox->isChecked() ),
- [this, homePartitionPath] {
+ [ this, homePartitionPath ]
+ {
m_reuseHomeCheckBox->setVisible( !homePartitionPath->isEmpty() );
if ( !homePartitionPath->isEmpty() )
m_reuseHomeCheckBox->setText( tr( "Reuse %1 as home partition for %2." )
@@ -1006,7 +1026,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
connect( m_afterPartitionSplitterWidget,
&PartitionSplitterWidget::partitionResized,
this,
- [this, sizeLabel]( const QString& path, qint64 size, qint64 sizeNext ) {
+ [ this, sizeLabel ]( const QString& path, qint64 size, qint64 sizeNext )
+ {
Q_UNUSED( path )
sizeLabel->setText(
tr( "%1 will be shrunk to %2MiB and a new "
@@ -1020,7 +1041,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
m_previewAfterFrame->show();
m_previewAfterLabel->show();
- SelectionFilter filter = []( const QModelIndex& index ) {
+ SelectionFilter filter = []( const QModelIndex& index )
+ {
return PartUtils::canBeResized(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ),
Logger::Once() );
@@ -1069,17 +1091,22 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
eraseBootloaderLabel->setText( tr( "Boot loader location:" ) );
m_bootloaderComboBox = createBootloaderComboBox( eraseWidget );
- connect( m_core->bootLoaderModel(), &QAbstractItemModel::modelReset, [this]() {
- if ( !m_bootloaderComboBox.isNull() )
- {
- Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox, m_core->bootLoaderInstallPath() );
- }
- } );
+ connect( m_core->bootLoaderModel(),
+ &QAbstractItemModel::modelReset,
+ [ this ]()
+ {
+ if ( !m_bootloaderComboBox.isNull() )
+ {
+ Calamares::restoreSelectedBootLoader( *m_bootloaderComboBox,
+ m_core->bootLoaderInstallPath() );
+ }
+ } );
connect(
m_core,
&PartitionCoreModule::deviceReverted,
this,
- [this]( Device* dev ) {
+ [ this ]( Device* dev )
+ {
Q_UNUSED( dev )
if ( !m_bootloaderComboBox.isNull() )
{
@@ -1110,7 +1137,8 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
}
else
{
- SelectionFilter filter = []( const QModelIndex& index ) {
+ SelectionFilter filter = []( const QModelIndex& index )
+ {
return PartUtils::canBeReplaced(
static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ),
Logger::Once() );
@@ -1217,18 +1245,22 @@ ChoicePage::createBootloaderComboBox( QWidget* parent )
comboForBootloader->setModel( m_core->bootLoaderModel() );
// When the chosen bootloader device changes, we update the choice in the PCM
- connect( comboForBootloader, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, [this]( int newIndex ) {
- QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
- if ( bootloaderCombo )
- {
- QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
- if ( !var.isValid() )
- {
- return;
- }
- m_core->setBootLoaderInstallPath( var.toString() );
- }
- } );
+ connect( comboForBootloader,
+ QOverload< int >::of( &QComboBox::currentIndexChanged ),
+ this,
+ [ this ]( int newIndex )
+ {
+ QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
+ if ( bootloaderCombo )
+ {
+ QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
+ if ( !var.isValid() )
+ {
+ return;
+ }
+ m_core->setBootLoaderInstallPath( var.toString() );
+ }
+ } );
return comboForBootloader;
}
diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp
index 6bde9a148..c5b17c69e 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.cpp
+++ b/src/modules/partition/gui/CreatePartitionDialog.cpp
@@ -325,16 +325,10 @@ CreatePartitionDialog::updateMountPointUi()
void
CreatePartitionDialog::checkMountPointSelection()
{
- if ( m_usedMountPoints.contains( selectedMountPoint( m_ui->mountPointComboBox ) ) )
- {
- m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) );
- m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
- }
- else
- {
- m_ui->labelMountPoint->setText( QString() );
- m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
- }
+ validateMountPoint( selectedMountPoint( m_ui->mountPointComboBox ),
+ m_usedMountPoints,
+ m_ui->mountPointExplanation,
+ m_ui->buttonBox->button( QDialogButtonBox::Ok ) );
}
void
diff --git a/src/modules/partition/gui/CreatePartitionDialog.ui b/src/modules/partition/gui/CreatePartitionDialog.ui
index dad932101..0ee715fe0 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.ui
+++ b/src/modules/partition/gui/CreatePartitionDialog.ui
@@ -68,7 +68,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
- &Primary
+ Primar&y
true
@@ -171,6 +171,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
+
+
+ 0
+ 0
+
+
true
@@ -179,21 +185,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
- -
-
-
-
-
-
- -
+
-
Flags:
- -
+
-
true
@@ -206,7 +205,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
- -
+
-
Qt::Vertical
@@ -219,14 +218,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
- -
+
-
-
-
- 150
- 16777215
-
-
Label for the filesystem
@@ -235,13 +228,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
- -
+
-
FS Label:
+ -
+
+
+
+
+
-
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index bbc8ce74c..39d9413e1 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -68,7 +68,8 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type )
void
DeviceInfoWidget::retranslateUi()
{
- QString typeString = PartitionTable::tableTypeToName( m_tableType ).toUpper();
+ QString typeString;
+ QString toolTipString;
// fix up if the name shouldn't be uppercase:
switch ( m_tableType )
@@ -76,38 +77,34 @@ DeviceInfoWidget::retranslateUi()
case PartitionTable::msdos:
case PartitionTable::msdos_sectorbased:
typeString = "MBR";
+ toolTipString += tr( "
This partition table type is only advisable on older "
+ "systems which start from a BIOS boot "
+ "environment. GPT is recommended in most other cases.
"
+ "Warning: the MBR partition table "
+ "is an obsolete MS-DOS era standard.
"
+ "Only 4 primary partitions may be created, and of "
+ "those 4, one can be an extended partition, which "
+ "may in turn contain many logical partitions." );
+ break;
+ case PartitionTable::gpt:
+ // TypeString is ok
+ toolTipString += tr( "
This is the recommended partition table type for modern "
+ "systems which start from an EFI boot "
+ "environment." );
break;
case PartitionTable::loop:
typeString = "loop";
- break;
- case PartitionTable::mac:
- typeString = "Mac";
- break;
- case PartitionTable::amiga:
- typeString = "Amiga";
- break;
- case PartitionTable::sun:
- typeString = "Sun";
- break;
- case PartitionTable::unknownTableType:
- typeString = " ? ";
- }
-
-
- QString toolTipString = tr( "This device has a %1 partition "
- "table." )
- .arg( typeString );
-
- switch ( m_tableType )
- {
- case PartitionTable::loop:
toolTipString = tr( "This is a loop "
"device.
"
"It is a pseudo-device with no partition table "
"that makes a file accessible as a block device. "
"This kind of setup usually only contains a single filesystem." );
break;
+#if defined( WITH_KPMCORE42API )
+ case PartitionTable::none:
+#endif
case PartitionTable::unknownTableType:
+ typeString = " ? ";
toolTipString = tr( "This installer cannot detect a partition table on the "
"selected storage device.
"
"The device either has no partition "
@@ -117,21 +114,35 @@ DeviceInfoWidget::retranslateUi()
"either automatically, or through the manual partitioning "
"page." );
break;
- case PartitionTable::gpt:
- toolTipString += tr( "
This is the recommended partition table type for modern "
- "systems which start from an EFI boot "
- "environment." );
+ // The next ones need to have the name adjusted, but the default tooltip is OK
+ case PartitionTable::mac:
+ typeString = "Mac";
break;
- case PartitionTable::msdos:
- case PartitionTable::msdos_sectorbased:
- toolTipString += tr( "
This partition table type is only advisable on older "
- "systems which start from a BIOS boot "
- "environment. GPT is recommended in most other cases.
"
- "Warning: the MBR partition table "
- "is an obsolete MS-DOS era standard.
"
- "Only 4 primary partitions may be created, and of "
- "those 4, one can be an extended partition, which "
- "may in turn contain many logical partitions." );
+ case PartitionTable::amiga:
+ typeString = "Amiga";
+ break;
+ case PartitionTable::sun:
+ typeString = "Sun";
+ break;
+ // Peculiar tables, do nothing and use default type and tooltip strings
+ case PartitionTable::aix:
+ case PartitionTable::bsd:
+ case PartitionTable::dasd:
+ case PartitionTable::dvh:
+ case PartitionTable::pc98:
+ case PartitionTable::vmd:
+ break;
+ }
+
+ if ( typeString.isEmpty() )
+ {
+ typeString = PartitionTable::tableTypeToName( m_tableType ).toUpper();
+ }
+ if ( toolTipString.isEmpty() )
+ {
+ toolTipString = tr( "This device has a %1 partition "
+ "table." )
+ .arg( typeString );
}
m_ptLabel->setText( typeString );
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index a3052b3b7..0bc35cabe 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -69,22 +69,25 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device,
replacePartResizerWidget();
- connect( m_ui->formatRadioButton, &QAbstractButton::toggled, [this]( bool doFormat ) {
- replacePartResizerWidget();
+ connect( m_ui->formatRadioButton,
+ &QAbstractButton::toggled,
+ [ this ]( bool doFormat )
+ {
+ replacePartResizerWidget();
- m_ui->fileSystemLabel->setEnabled( doFormat );
- m_ui->fileSystemComboBox->setEnabled( doFormat );
+ m_ui->fileSystemLabel->setEnabled( doFormat );
+ m_ui->fileSystemComboBox->setEnabled( doFormat );
- if ( !doFormat )
- {
- m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) );
- }
+ if ( !doFormat )
+ {
+ m_ui->fileSystemComboBox->setCurrentText( userVisibleFS( m_partition->fileSystem() ) );
+ }
- updateMountPointPicker();
- } );
+ updateMountPointPicker();
+ } );
connect(
- m_ui->fileSystemComboBox, &QComboBox::currentTextChanged, [this]( QString ) { updateMountPointPicker(); } );
+ m_ui->fileSystemComboBox, &QComboBox::currentTextChanged, [ this ]( QString ) { updateMountPointPicker(); } );
// File system
QStringList fsNames;
@@ -295,14 +298,8 @@ EditExistingPartitionDialog::updateMountPointPicker()
void
EditExistingPartitionDialog::checkMountPointSelection()
{
- if ( m_usedMountPoints.contains( selectedMountPoint( m_ui->mountPointComboBox ) ) )
- {
- m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) );
- m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
- }
- else
- {
- m_ui->labelMountPoint->setText( QString() );
- m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
- }
+ validateMountPoint( selectedMountPoint( m_ui->mountPointComboBox ),
+ m_usedMountPoints,
+ m_ui->mountPointExplanation,
+ m_ui->buttonBox->button( QDialogButtonBox::Ok ) );
}
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.ui b/src/modules/partition/gui/EditExistingPartitionDialog.ui
index 7599bc772..4a9982656 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.ui
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.ui
@@ -51,7 +51,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
- Content:
+ Con&tent:
keepRadioButton
@@ -109,6 +109,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
+
+
+ 0
+ 0
+
+
true
@@ -147,14 +153,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
- -
+
-
Flags:
- -
+
-
true
@@ -168,20 +174,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
-
-
-
-
-
- -
-
-
- 150
- 16777215
-
-
Label for the filesystem
@@ -190,13 +183,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
- -
+
-
FS Label:
+ -
+
+
+
+
+
-
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index ee50e7d66..fe7623050 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -13,9 +13,27 @@
#include "ui_EncryptWidget.h"
+#include "Branding.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Retranslator.h"
+/** @brief Does this system support whole-disk encryption?
+ *
+ * Returns @c true if the system is likely to support encryption
+ * with sufficient performance to be usable. A machine that can't
+ * doe hardware-assisted AES is **probably** too slow, so we could
+ * warn the user that ticking the "encrypt system" box is a bad
+ * idea.
+ *
+ * Since we don't have an oracle that can answer that question,
+ * just pretend every system can do it.
+ */
+static inline bool
+systemSupportsEncryptionAcceptably()
+{
+ return true;
+}
+
EncryptWidget::EncryptWidget( QWidget* parent )
: QWidget( parent )
, m_ui( new Ui::EncryptWidget )
@@ -27,6 +45,18 @@ EncryptWidget::EncryptWidget( QWidget* parent )
m_ui->m_passphraseLineEdit->hide();
m_ui->m_confirmLineEdit->hide();
m_ui->m_iconLabel->hide();
+ // TODO: this deserves better rendering, an icon or something, but that will
+ // depend on having a non-bogus implementation of systemSupportsEncryptionAcceptably
+ if ( systemSupportsEncryptionAcceptably() )
+ {
+ m_ui->m_encryptionUnsupportedLabel->hide();
+ }
+ else
+ {
+ // This is really ugly, but the character is unicode "unlocked"
+ m_ui->m_encryptionUnsupportedLabel->setText( QStringLiteral( "🔓" ) );
+ m_ui->m_encryptionUnsupportedLabel->show();
+ }
connect( m_ui->m_encryptCheckBox, &QCheckBox::stateChanged, this, &EncryptWidget::onCheckBoxStateChanged );
connect( m_ui->m_passphraseLineEdit, &QLineEdit::textEdited, this, &EncryptWidget::onPassphraseEdited );
diff --git a/src/modules/partition/gui/EncryptWidget.ui b/src/modules/partition/gui/EncryptWidget.ui
index 212300291..a629163d3 100644
--- a/src/modules/partition/gui/EncryptWidget.ui
+++ b/src/modules/partition/gui/EncryptWidget.ui
@@ -37,6 +37,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ -
+
+
+ Your system does not seem to support encryption well enough to encrypt the entire system. You may enable encryption, but performance may suffer.
+
+
+ 🔓
+
+
+ Qt::AlignCenter
+
+
+
-
@@ -57,6 +70,19 @@ SPDX-License-Identifier: GPL-3.0-or-later
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
diff --git a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp
index 1e8a9e573..8eeafcbf4 100644
--- a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp
+++ b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp
@@ -9,11 +9,10 @@
#include "ListPhysicalVolumeWidgetItem.h"
-#include
+#include "core/SizeUtils.h"
ListPhysicalVolumeWidgetItem::ListPhysicalVolumeWidgetItem( const Partition* partition, bool checked )
- : QListWidgetItem(
- QString( "%1 | %2" ).arg( partition->deviceNode(), Capacity::formatByteSize( partition->capacity() ) ) )
+ : QListWidgetItem( QString( "%1 | %2" ).arg( partition->deviceNode(), formatByteSize( partition->capacity() ) ) )
, m_partition( partition )
{
setToolTip( partition->deviceNode() );
@@ -26,3 +25,5 @@ ListPhysicalVolumeWidgetItem::partition() const
{
return m_partition;
}
+
+ListPhysicalVolumeWidgetItem::~ListPhysicalVolumeWidgetItem() {}
diff --git a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h
index 6e0b1c85a..5d7fdcb76 100644
--- a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h
+++ b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h
@@ -18,6 +18,7 @@ class ListPhysicalVolumeWidgetItem : public QListWidgetItem
{
public:
ListPhysicalVolumeWidgetItem( const Partition* partition, bool checked );
+ ~ListPhysicalVolumeWidgetItem() override;
const Partition* partition() const;
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index 81f518acc..305184b13 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -54,9 +54,10 @@ PartitionBarsView::PartitionBarsView( QWidget* parent )
setSelectionMode( QAbstractItemView::SingleSelection );
// Debug
- connect( this, &PartitionBarsView::clicked, this, [=]( const QModelIndex& index ) {
- cDebug() << "Clicked row" << index.row();
- } );
+ connect( this,
+ &PartitionBarsView::clicked,
+ this,
+ [ = ]( const QModelIndex& index ) { cDebug() << "Clicked row" << index.row(); } );
setMouseTracking( true );
}
@@ -399,7 +400,7 @@ void
PartitionBarsView::setSelectionModel( QItemSelectionModel* selectionModel )
{
QAbstractItemView::setSelectionModel( selectionModel );
- connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [=] { viewport()->repaint(); } );
+ connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } );
}
@@ -410,7 +411,8 @@ PartitionBarsView::setSelectionFilter( std::function< bool( const QModelIndex& )
}
-QModelIndex PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers )
+QModelIndex
+PartitionBarsView::moveCursor( CursorAction, Qt::KeyboardModifiers )
{
return QModelIndex();
}
diff --git a/src/modules/partition/gui/PartitionDialogHelpers.cpp b/src/modules/partition/gui/PartitionDialogHelpers.cpp
index 65e88f898..1ba110338 100644
--- a/src/modules/partition/gui/PartitionDialogHelpers.cpp
+++ b/src/modules/partition/gui/PartitionDialogHelpers.cpp
@@ -12,13 +12,17 @@
#include "PartitionDialogHelpers.h"
#include "core/PartUtils.h"
+#include "gui/CreatePartitionDialog.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/Logger.h"
#include
+#include
+#include
#include
+#include
QStringList
standardMountPoints()
@@ -37,7 +41,7 @@ void
standardMountPoints( QComboBox& combo )
{
combo.clear();
- combo.addItem( QObject::tr( "(no mount point)" ) );
+ combo.lineEdit()->setPlaceholderText( QObject::tr( "(no mount point)" ) );
combo.addItems( standardMountPoints() );
}
@@ -51,10 +55,6 @@ standardMountPoints( QComboBox& combo, const QString& selected )
QString
selectedMountPoint( QComboBox& combo )
{
- if ( combo.currentIndex() == 0 )
- {
- return QString();
- }
return combo.currentText();
}
@@ -63,7 +63,7 @@ setSelectedMountPoint( QComboBox& combo, const QString& selected )
{
if ( selected.isEmpty() )
{
- combo.setCurrentIndex( 0 ); // (no mount point)
+ combo.setCurrentIndex( -1 ); // (no mount point)
}
else
{
@@ -80,6 +80,34 @@ setSelectedMountPoint( QComboBox& combo, const QString& selected )
}
}
+bool
+validateMountPoint( const QString& mountPoint, const QStringList& inUse, QLabel* label, QPushButton* button )
+{
+ QString msg;
+ bool ok = true;
+
+ if ( inUse.contains( mountPoint ) )
+ {
+ msg = CreatePartitionDialog::tr( "Mountpoint already in use. Please select another one." );
+ ok = false;
+ }
+ else if ( !mountPoint.isEmpty() && !mountPoint.startsWith( '/' ) )
+ {
+ msg = CreatePartitionDialog::tr( "Mountpoint must start with a /." );
+ ok = false;
+ }
+
+ if ( label )
+ {
+ label->setText( msg );
+ }
+ if ( button )
+ {
+ button->setEnabled( ok );
+ }
+ return ok;
+}
+
PartitionTable::Flags
flagsFromList( const QListWidget& list )
diff --git a/src/modules/partition/gui/PartitionDialogHelpers.h b/src/modules/partition/gui/PartitionDialogHelpers.h
index 7761004b5..eea0998c4 100644
--- a/src/modules/partition/gui/PartitionDialogHelpers.h
+++ b/src/modules/partition/gui/PartitionDialogHelpers.h
@@ -16,7 +16,9 @@
#include
+class QPushButton;
class QComboBox;
+class QLabel;
class QListWidget;
/**
@@ -58,6 +60,16 @@ setSelectedMountPoint( QComboBox* combo, const QString& selected )
setSelectedMountPoint( *combo, selected );
}
+/** @brief Validate a @p mountPoint and adjust the UI
+ *
+ * If @p mountPoint is valid -- unused and starts with a /, for instance --
+ * then the button is enabled, label is cleared, and returns @c true.
+ *
+ * If it is not valid, returns @c false and sets the UI
+ * to explain why.
+ */
+bool validateMountPoint( const QString& mountPoint, const QStringList& inUse, QLabel* label, QPushButton* button );
+
/**
* Get the flags that have been checked in the list widget.
*/
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index 5803d59a2..e3a50c576 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -12,6 +12,7 @@
#include "core/ColorUtils.h"
#include "core/PartitionModel.h"
+#include "core/SizeUtils.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
@@ -20,8 +21,6 @@
#include
#include
-#include
-
// Qt
#include
#include
@@ -39,7 +38,7 @@ static QStringList
buildUnknownDisklabelTexts( Device* dev )
{
QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ),
- KFormat().formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
+ formatByteSize( dev->totalLogical() * dev->logicalSize() ) };
return texts;
}
@@ -520,7 +519,7 @@ void
PartitionLabelsView::setSelectionModel( QItemSelectionModel* selectionModel )
{
QAbstractItemView::setSelectionModel( selectionModel );
- connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [=] { viewport()->repaint(); } );
+ connect( selectionModel, &QItemSelectionModel::selectionChanged, this, [ = ] { viewport()->repaint(); } );
}
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 9d7a2f0d7..0b3cf2478 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -451,15 +451,18 @@ void
PartitionPage::onRevertClicked()
{
ScanningDialog::run(
- QtConcurrent::run( [this] {
- QMutexLocker locker( &m_revertMutex );
+ QtConcurrent::run(
+ [ this ]
+ {
+ QMutexLocker locker( &m_revertMutex );
- int oldIndex = m_ui->deviceComboBox->currentIndex();
- m_core->revertAllDevices();
- m_ui->deviceComboBox->setCurrentIndex( ( oldIndex < 0 ) ? 0 : oldIndex );
- updateFromCurrentDevice();
- } ),
- [this] {
+ int oldIndex = m_ui->deviceComboBox->currentIndex();
+ m_core->revertAllDevices();
+ m_ui->deviceComboBox->setCurrentIndex( ( oldIndex < 0 ) ? 0 : oldIndex );
+ updateFromCurrentDevice();
+ } ),
+ [ this ]
+ {
m_lastSelectedBootLoaderIndex = -1;
if ( m_ui->bootLoaderComboBox->currentIndex() < 0 )
{
@@ -606,7 +609,8 @@ PartitionPage::updateFromCurrentDevice()
m_ui->partitionBarsView->selectionModel(),
&QItemSelectionModel::currentChanged,
this,
- [=] {
+ [ = ]
+ {
QModelIndex selectedIndex = m_ui->partitionBarsView->selectionModel()->currentIndex();
selectedIndex = selectedIndex.sibling( selectedIndex.row(), 0 );
m_ui->partitionBarsView->setCurrentIndex( selectedIndex );
@@ -625,7 +629,7 @@ PartitionPage::updateFromCurrentDevice()
// model changes
connect( m_ui->partitionTreeView->selectionModel(),
&QItemSelectionModel::currentChanged,
- [this]( const QModelIndex&, const QModelIndex& ) { updateButtons(); } );
+ [ this ]( const QModelIndex&, const QModelIndex& ) { updateButtons(); } );
connect( model, &QAbstractItemModel::modelReset, this, &PartitionPage::onPartitionModelReset );
}
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index 0cafe7814..e52afaa74 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -159,14 +159,16 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize,
m_itemToResizePath.clear();
}
- PartitionSplitterItem itemToResize = _findItem( m_items, [path]( PartitionSplitterItem& item ) -> bool {
- if ( path == item.itemPath )
- {
- item.status = PartitionSplitterItem::Resizing;
- return true;
- }
- return false;
- } );
+ PartitionSplitterItem itemToResize = _findItem( m_items,
+ [ path ]( PartitionSplitterItem& item ) -> bool
+ {
+ if ( path == item.itemPath )
+ {
+ item.status = PartitionSplitterItem::Resizing;
+ return true;
+ }
+ return false;
+ } );
if ( itemToResize.isNull() )
{
@@ -184,14 +186,16 @@ PartitionSplitterWidget::setSplitPartition( const QString& path, qint64 minSize,
qint64 newSize = m_itemToResize.size - preferredSize;
m_itemToResize.size = preferredSize;
- int opCount = _eachItem( m_items, [preferredSize]( PartitionSplitterItem& item ) -> bool {
- if ( item.status == PartitionSplitterItem::Resizing )
- {
- item.size = preferredSize;
- return true;
- }
- return false;
- } );
+ int opCount = _eachItem( m_items,
+ [ preferredSize ]( PartitionSplitterItem& item ) -> bool
+ {
+ if ( item.status == PartitionSplitterItem::Resizing )
+ {
+ item.size = preferredSize;
+ return true;
+ }
+ return false;
+ } );
cDebug() << "each splitter item opcount:" << opCount;
m_itemMinSize = minSize;
m_itemMaxSize = maxSize;
@@ -358,19 +362,21 @@ PartitionSplitterWidget::mouseMoveEvent( QMouseEvent* event )
m_itemToResize.size = qRound64( span * percent );
m_itemToResizeNext.size -= m_itemToResize.size - oldsize;
- _eachItem( m_items, [this]( PartitionSplitterItem& item ) -> bool {
- if ( item.status == PartitionSplitterItem::Resizing )
- {
- item.size = m_itemToResize.size;
- return true;
- }
- else if ( item.status == PartitionSplitterItem::ResizingNext )
- {
- item.size = m_itemToResizeNext.size;
- return true;
- }
- return false;
- } );
+ _eachItem( m_items,
+ [ this ]( PartitionSplitterItem& item ) -> bool
+ {
+ if ( item.status == PartitionSplitterItem::Resizing )
+ {
+ item.size = m_itemToResize.size;
+ return true;
+ }
+ else if ( item.status == PartitionSplitterItem::ResizingNext )
+ {
+ item.size = m_itemToResizeNext.size;
+ return true;
+ }
+ return false;
+ } );
repaint();
diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp
index 94f527646..76f9ff963 100644
--- a/src/modules/partition/gui/ReplaceWidget.cpp
+++ b/src/modules/partition/gui/ReplaceWidget.cpp
@@ -46,9 +46,10 @@ ReplaceWidget::ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesCombo
m_ui->bootStatusLabel->clear();
updateFromCurrentDevice( devicesComboBox );
- connect( devicesComboBox, &QComboBox::currentTextChanged, this, [=]( const QString& /* text */ ) {
- updateFromCurrentDevice( devicesComboBox );
- } );
+ connect( devicesComboBox,
+ &QComboBox::currentTextChanged,
+ this,
+ [ = ]( const QString& /* text */ ) { updateFromCurrentDevice( devicesComboBox ); } );
CALAMARES_RETRANSLATE( onPartitionSelected(); );
}
@@ -212,7 +213,8 @@ ReplaceWidget::onPartitionSelected()
}
}
- if ( partition->capacity() < requiredSpaceB )
+ // The loss of precision is ok; we're not going to fall over from a single byte
+ if ( static_cast< double >( partition->capacity() ) < requiredSpaceB )
{
updateStatus( CalamaresUtils::Fail,
tr( "%4
"
diff --git a/src/modules/partition/gui/ScanningDialog.cpp b/src/modules/partition/gui/ScanningDialog.cpp
index 4dffa922b..56133e21f 100644
--- a/src/modules/partition/gui/ScanningDialog.cpp
+++ b/src/modules/partition/gui/ScanningDialog.cpp
@@ -47,12 +47,16 @@ ScanningDialog::run( const QFuture< void >& future,
theDialog->show();
QFutureWatcher< void >* watcher = new QFutureWatcher< void >();
- connect( watcher, &QFutureWatcher< void >::finished, theDialog, [watcher, theDialog, callback] {
- watcher->deleteLater();
- theDialog->hide();
- theDialog->deleteLater();
- callback();
- } );
+ connect( watcher,
+ &QFutureWatcher< void >::finished,
+ theDialog,
+ [ watcher, theDialog, callback ]
+ {
+ watcher->deleteLater();
+ theDialog->hide();
+ theDialog->deleteLater();
+ callback();
+ } );
watcher->setFuture( future );
}
diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
index 6277c30e5..818a60483 100644
--- a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
+++ b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp
@@ -10,10 +10,9 @@
#include "VolumeGroupBaseDialog.h"
#include "ui_VolumeGroupBaseDialog.h"
+#include "core/SizeUtils.h"
#include "gui/ListPhysicalVolumeWidgetItem.h"
-#include
-
#include
#include
#include
@@ -46,17 +45,25 @@ VolumeGroupBaseDialog::VolumeGroupBaseDialog( QString& vgName, QVector< const Pa
updateOkButton();
updateTotalSize();
- connect( ui->pvList, &QListWidget::itemChanged, this, [&]( QListWidgetItem* ) {
- updateTotalSize();
- updateOkButton();
- } );
+ connect( ui->pvList,
+ &QListWidget::itemChanged,
+ this,
+ [ & ]( QListWidgetItem* )
+ {
+ updateTotalSize();
+ updateOkButton();
+ } );
- connect( ui->peSize, qOverload< int >( &QSpinBox::valueChanged ), this, [&]( int ) {
- updateTotalSectors();
- updateOkButton();
- } );
+ connect( ui->peSize,
+ qOverload< int >( &QSpinBox::valueChanged ),
+ this,
+ [ & ]( int )
+ {
+ updateTotalSectors();
+ updateOkButton();
+ } );
- connect( ui->vgName, &QLineEdit::textChanged, this, [&]( const QString& ) { updateOkButton(); } );
+ connect( ui->vgName, &QLineEdit::textChanged, this, [ & ]( const QString& ) { updateOkButton(); } );
}
VolumeGroupBaseDialog::~VolumeGroupBaseDialog()
@@ -100,7 +107,7 @@ VolumeGroupBaseDialog::setUsedSizeValue( qint64 usedSize )
{
m_usedSizeValue = usedSize;
- ui->usedSize->setText( Capacity::formatByteSize( m_usedSizeValue ) );
+ ui->usedSize->setText( formatByteSize( m_usedSizeValue ) );
}
void
@@ -121,7 +128,7 @@ VolumeGroupBaseDialog::updateTotalSize()
% ( ui->peSize->value() * Capacity::unitFactor( Capacity::Unit::Byte, Capacity::Unit::MiB ) );
}
- ui->totalSize->setText( Capacity::formatByteSize( m_totalSizeValue ) );
+ ui->totalSize->setText( formatByteSize( m_totalSizeValue ) );
updateTotalSectors();
}
diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp
index e276447db..29b197933 100644
--- a/src/modules/partition/jobs/AutoMountManagementJob.cpp
+++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp
@@ -26,7 +26,9 @@ Calamares::JobResult
AutoMountManagementJob::exec()
{
cVerbose() << "this" << Logger::Pointer( this ) << "value" << Logger::Pointer( m_stored )
- << ( m_stored ? "restore" : m_disable ? "disable" : "enable" );
+ << ( m_stored ? "restore"
+ : m_disable ? "disable"
+ : "enable" );
if ( m_stored )
{
CalamaresUtils::Partition::automountRestore( m_stored );
diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp
index 831a1e868..3d7b9d0de 100644
--- a/src/modules/partition/jobs/ClearMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearMountsJob.cpp
@@ -157,9 +157,11 @@ getLVMVolumes()
QStringList lvscanLines = QString::fromLocal8Bit( process.readAllStandardOutput() ).split( '\n' );
// Get the second column (`value(1)`) sinec that is the device name,
// remove quoting.
- std::transform( lvscanLines.begin(), lvscanLines.end(), lvscanLines.begin(), []( const QString& lvscanLine ) {
- return lvscanLine.simplified().split( ' ' ).value( 1 ).replace( '\'', "" );
- } );
+ std::transform( lvscanLines.begin(),
+ lvscanLines.end(),
+ lvscanLines.begin(),
+ []( const QString& lvscanLine )
+ { return lvscanLine.simplified().split( ' ' ).value( 1 ).replace( '\'', "" ); } );
return lvscanLines;
}
else
@@ -243,14 +245,8 @@ public:
}
private:
-#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) )
- // TODO: 3.3 remove because newer Qt does support constness
const char* m_message = nullptr;
QString m_path;
-#else
- const char* const m_message = nullptr;
- QString const m_path;
-#endif
};
STATICTEST inline QDebug&
diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp
index ffbc35044..6219de004 100644
--- a/src/modules/partition/jobs/ClearTempMountsJob.cpp
+++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp
@@ -9,6 +9,7 @@
#include "ClearTempMountsJob.h"
+#include "partition/Mount.h"
#include "utils/Logger.h"
#include "utils/String.h"
@@ -45,51 +46,23 @@ ClearTempMountsJob::exec()
{
Logger::Once o;
// Fetch a list of current mounts to Calamares temporary directories.
- QList< QPair< QString, QString > > lst;
- QFile mtab( "/etc/mtab" );
- if ( !mtab.open( QFile::ReadOnly | QFile::Text ) )
- {
- return Calamares::JobResult::error( tr( "Cannot get list of temporary mounts." ) );
- }
+ using MtabInfo = CalamaresUtils::Partition::MtabInfo;
+ auto targetMounts = MtabInfo::fromMtabFilteredByPrefix( QStringLiteral( "/tmp/calamares-" ) );
- cVerbose() << o << "Opened mtab. Lines:";
- QTextStream in( &mtab );
- QString lineIn = in.readLine();
- while ( !lineIn.isNull() )
- {
- QStringList line = lineIn.split( ' ', SplitSkipEmptyParts );
- cVerbose() << o << line.join( ' ' );
- QString device = line.at( 0 );
- QString mountPoint = line.at( 1 );
- if ( mountPoint.startsWith( "/tmp/calamares-" ) )
- {
- lst.append( qMakePair( device, mountPoint ) );
- }
- lineIn = in.readLine();
- }
-
- if ( lst.empty() )
+ if ( targetMounts.isEmpty() )
{
return Calamares::JobResult::ok();
}
-
- std::sort(
- lst.begin(), lst.end(), []( const QPair< QString, QString >& a, const QPair< QString, QString >& b ) -> bool {
- return a.first > b.first;
- } );
+ std::sort( targetMounts.begin(), targetMounts.end(), MtabInfo::mountPointOrder );
QStringList goodNews;
- QProcess process;
-
- for ( const auto& line : qAsConst( lst ) )
+ for ( const auto& m : qAsConst( targetMounts ) )
{
- QString partPath = line.second;
- cDebug() << o << "Will try to umount path" << partPath;
- process.start( "umount", { "-lv", partPath } );
- process.waitForFinished();
- if ( process.exitCode() == 0 )
+ cDebug() << o << "Will try to umount path" << m.mountPoint;
+ if ( CalamaresUtils::Partition::unmount( m.mountPoint, { "-lv" } ) == 0 )
{
- goodNews.append( QString( "Successfully unmounted %1." ).arg( partPath ) );
+ // Returns the program's exit code, so 0 is success
+ goodNews.append( QString( "Successfully unmounted %1." ).arg( m.mountPoint ) );
}
}
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 83ebc0509..fe7c6f350 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -11,7 +11,9 @@
#include "CreatePartitionJob.h"
+#include "core/KPMHelpers.h"
#include "core/PartitionInfo.h"
+
#include "partition/FileSystem.h"
#include "partition/PartitionQuery.h"
#include "utils/CalamaresUtilsSystem.h"
@@ -60,24 +62,24 @@ createZfs( Partition* partition, Device* device )
// Now we need to do some things that would normally be done by kpmcore
// First we get the device node from the output and set it as the partition path
- QRegularExpression re( QStringLiteral( "Created a new partition (\\d+)" ) );
- QRegularExpressionMatch rem = re.match( r.getOutput() );
-
QString deviceNode;
- if ( rem.hasMatch() )
{
- if ( partition->devicePath().back().isDigit() )
+ QRegularExpression re( QStringLiteral( "Created a new partition (\\d+)" ) );
+ QRegularExpressionMatch rem = re.match( r.getOutput() );
+
+ if ( rem.hasMatch() )
{
- deviceNode = partition->devicePath() + QLatin1Char( 'p' ) + rem.captured( 1 );
- }
- else
- {
- deviceNode = partition->devicePath() + rem.captured( 1 );
+ if ( partition->devicePath().back().isDigit() )
+ {
+ deviceNode = partition->devicePath() + QLatin1Char( 'p' ) + rem.captured( 1 );
+ }
+ else
+ {
+ deviceNode = partition->devicePath() + rem.captured( 1 );
+ }
}
+ partition->setPartitionPath( deviceNode );
}
-
- partition->setPartitionPath( deviceNode );
-
// If it is a gpt device, set the partition UUID
if ( device->partitionTable()->type() == PartitionTable::gpt && partition->uuid().isEmpty() )
{
@@ -273,17 +275,9 @@ CreatePartitionJob::exec()
return createZfs( m_partition, m_device );
}
- Report report( nullptr );
- NewOperation op( *m_device, m_partition );
- op.setStatus( Operation::StatusRunning );
-
- QString message = tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute(
+ NewOperation( *m_device, m_partition ),
+ tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) );
}
void
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 118ec8823..3b9415d1a 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -12,9 +12,11 @@
#include "CreatePartitionTableJob.h"
#include "partition/PartitionIterator.h"
+#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
-// KPMcore
+#include "core/KPMHelpers.h"
+
#include
#include
#include
@@ -63,8 +65,6 @@ CreatePartitionTableJob::prettyStatusMessage() const
Calamares::JobResult
CreatePartitionTableJob::exec()
{
- Report report( nullptr );
- QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() );
PartitionTable* table = m_device->partitionTable();
@@ -76,30 +76,16 @@ CreatePartitionTableJob::exec()
cDebug() << Logger::SubEntry << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) );
}
- QProcess lsblk;
- lsblk.setProgram( "lsblk" );
- lsblk.setProcessChannelMode( QProcess::MergedChannels );
- lsblk.start();
- lsblk.waitForFinished();
- cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblk.readAllStandardOutput();
+ auto lsblkResult = CalamaresUtils::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) );
+ cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblkResult.getOutput();
- QProcess mount;
- mount.setProgram( "mount" ); // Debug output only, not mounting something
- mount.setProcessChannelMode( QProcess::MergedChannels );
- mount.start();
- mount.waitForFinished();
- cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mount.readAllStandardOutput();
+ auto mountResult = CalamaresUtils::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) );
+ cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mountResult.getOutput();
}
- CreatePartitionTableOperation op( *m_device, table );
- op.setStatus( Operation::StatusRunning );
-
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute(
+ CreatePartitionTableOperation( *m_device, table ),
+ tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ) );
}
void
diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
index 36d79b7b7..683913b7f 100644
--- a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp
@@ -9,7 +9,8 @@
#include "CreateVolumeGroupJob.h"
-// KPMcore
+#include "core/KPMHelpers.h"
+
#include
#include
#include
@@ -46,19 +47,8 @@ CreateVolumeGroupJob::prettyStatusMessage() const
Calamares::JobResult
CreateVolumeGroupJob::exec()
{
- Report report( nullptr );
-
- CreateVolumeGroupOperation op( m_vgName, m_pvList, m_peSize );
-
- op.setStatus( Operation::StatusRunning );
-
- QString message = tr( "The installer failed to create a volume group named '%1'." ).arg( m_vgName );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute( CreateVolumeGroupOperation( m_vgName, m_pvList, m_peSize ),
+ tr( "The installer failed to create a volume group named '%1'." ).arg( m_vgName ) );
}
void
diff --git a/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp b/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp
index 92086015d..65920a84e 100644
--- a/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp
@@ -9,6 +9,8 @@
#include "DeactivateVolumeGroupJob.h"
+#include "core/KPMHelpers.h"
+
#include
#include
#include
@@ -39,18 +41,12 @@ DeactivateVolumeGroupJob::prettyStatusMessage() const
Calamares::JobResult
DeactivateVolumeGroupJob::exec()
{
- Report report( nullptr );
-
DeactivateVolumeGroupOperation op( *m_device );
-
- op.setStatus( Operation::OperationStatus::StatusRunning );
-
- QString message = tr( "The installer failed to deactivate a volume group named %1." ).arg( m_device->name() );
- if ( op.execute( report ) )
+ auto r = KPMHelpers::execute(
+ op, tr( "The installer failed to deactivate a volume group named %1." ).arg( m_device->name() ) );
+ if ( r )
{
op.preview();
- return Calamares::JobResult::ok();
}
-
- return Calamares::JobResult::error( message, report.toText() );
+ return r;
}
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index a678b5e90..d61bb955e 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -10,9 +10,11 @@
*/
#include "DeletePartitionJob.h"
+
+#include "core/KPMHelpers.h"
+
#include "utils/CalamaresUtilsSystem.h"
-// KPMcore
#include
#include
#include
@@ -45,7 +47,7 @@ removePartition( Partition* partition )
auto r = CalamaresUtils::System::instance()->runCommand(
{ "sfdisk", "--delete", "--force", partition->devicePath(), QString::number( partition->number() ) },
std::chrono::seconds( 5 ) );
- if ( r.getExitCode() !=0 || r.getOutput().contains("failed") )
+ if ( r.getExitCode() != 0 || r.getOutput().contains( "failed" ) )
{
return Calamares::JobResult::error(
QCoreApplication::translate( DeletePartitionJob::staticMetaObject.className(), "Deletion Failed" ),
@@ -96,17 +98,8 @@ DeletePartitionJob::exec()
return removePartition( m_partition );
}
- Report report( nullptr );
- DeleteOperation op( *m_device, m_partition );
- op.setStatus( Operation::StatusRunning );
-
- QString message = tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute( DeleteOperation( *m_device, m_partition ),
+ tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ) );
}
void
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 4dadacf9c..63d233426 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -11,7 +11,10 @@
#include "FormatPartitionJob.h"
+#include "core/KPMHelpers.h"
+
#include "partition/FileSystem.h"
+#include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include
@@ -65,17 +68,18 @@ FormatPartitionJob::prettyStatusMessage() const
Calamares::JobResult
FormatPartitionJob::exec()
{
- Report report( nullptr ); // Root of the report tree, no parent
- CreateFileSystemOperation op( *m_device, *m_partition, m_partition->fileSystem().type() );
- op.setStatus( Operation::StatusRunning );
-
- QString message = tr( "The installer failed to format partition %1 on disk '%2'." )
- .arg( m_partition->partitionPath(), m_device->name() );
-
- if ( op.execute( report ) )
+ const auto fsType = m_partition->fileSystem().type();
+ auto r = KPMHelpers::execute( CreateFileSystemOperation( *m_device, *m_partition, fsType ),
+ tr( "The installer failed to format partition %1 on disk '%2'." )
+ .arg( m_partition->partitionPath(), m_device->name() ) );
+ if ( fsType == FileSystem::Xfs && r.succeeded() )
{
- return Calamares::JobResult::ok();
+ // We are going to try to set modern timestamps for the filesystem,
+ // (ignoring whether this succeeds). Requires a sufficiently-new
+ // xfs_admin and xfs_repair and might be made obsolete by newer
+ // kpmcore releases.
+ CalamaresUtils::System::runCommand( { "xfs_admin", "-O", "bigtime=1", m_partition->partitionPath() },
+ std::chrono::seconds( 60 ) );
}
-
- return Calamares::JobResult::error( message, report.toText() );
+ return r;
}
diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
index 3c4e7b036..227351064 100644
--- a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp
@@ -9,6 +9,8 @@
#include "RemoveVolumeGroupJob.h"
+#include "core/KPMHelpers.h"
+
#include
#include
#include
@@ -39,17 +41,7 @@ RemoveVolumeGroupJob::prettyStatusMessage() const
Calamares::JobResult
RemoveVolumeGroupJob::exec()
{
- Report report( nullptr );
-
- RemoveVolumeGroupOperation op( *m_device );
-
- op.setStatus( Operation::OperationStatus::StatusRunning );
-
- QString message = tr( "The installer failed to remove a volume group named '%1'." ).arg( m_device->name() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute(
+ RemoveVolumeGroupOperation( *m_device ),
+ tr( "The installer failed to remove a volume group named '%1'." ).arg( m_device->name() ) );
}
diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp
index 87b87c1c0..fe1ceca4c 100644
--- a/src/modules/partition/jobs/ResizePartitionJob.cpp
+++ b/src/modules/partition/jobs/ResizePartitionJob.cpp
@@ -11,9 +11,10 @@
#include "ResizePartitionJob.h"
+#include "core/KPMHelpers.h"
+
#include "utils/Units.h"
-// KPMcore
#include
#include
#include
@@ -66,23 +67,16 @@ ResizePartitionJob::prettyStatusMessage() const
Calamares::JobResult
ResizePartitionJob::exec()
{
- Report report( nullptr );
// Restore partition sectors that were modified for preview
m_partition->setFirstSector( m_oldFirstSector );
m_partition->setLastSector( m_oldLastSector );
+
ResizeOperation op( *m_device, *m_partition, m_newFirstSector, m_newLastSector );
- op.setStatus( Operation::StatusRunning );
connect( &op, &Operation::progress, this, &ResizePartitionJob::iprogress );
-
- QString errorMessage = tr( "The installer failed to resize partition %1 on disk '%2'." )
- .arg( m_partition->partitionPath() )
- .arg( m_device->name() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( errorMessage, report.toText() );
+ return KPMHelpers::execute( op,
+ tr( "The installer failed to resize partition %1 on disk '%2'." )
+ .arg( m_partition->partitionPath() )
+ .arg( m_device->name() ) );
}
void
diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
index 1aa4541b8..f7a21d80d 100644
--- a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
+++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp
@@ -9,7 +9,8 @@
#include "ResizeVolumeGroupJob.h"
-// KPMcore
+#include "core/KPMHelpers.h"
+
#include
#include
#include
@@ -51,19 +52,9 @@ ResizeVolumeGroupJob::prettyStatusMessage() const
Calamares::JobResult
ResizeVolumeGroupJob::exec()
{
- Report report( nullptr );
-
- ResizeVolumeGroupOperation op( *m_device, m_partitionList );
-
- op.setStatus( Operation::OperationStatus::StatusRunning );
-
- QString message = tr( "The installer failed to resize a volume group named '%1'." ).arg( m_device->name() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( message, report.toText() );
+ return KPMHelpers::execute(
+ ResizeVolumeGroupOperation( *m_device, m_partitionList ),
+ tr( "The installer failed to resize a volume group named '%1'." ).arg( m_device->name() ) );
}
QString
diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
index de77d86f8..507773288 100644
--- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
+++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp
@@ -13,6 +13,8 @@
#include "SetPartitionFlagsJob.h"
+#include "core/KPMHelpers.h"
+
#include "partition/FileSystem.h"
#include "utils/Logger.h"
#include "utils/Units.h"
@@ -148,17 +150,8 @@ SetPartFlagsJob::exec()
cDebug() << "Setting flags on" << m_device->deviceNode() << "partition" << partition()->deviceNode()
<< Logger::DebugList( flagsList );
- Report report( nullptr );
SetPartFlagsOperation op( *m_device, *partition(), m_flags );
- op.setStatus( Operation::StatusRunning );
connect( &op, &Operation::progress, this, &SetPartFlagsJob::iprogress );
-
- QString errorMessage
- = tr( "The installer failed to set flags on partition %1." ).arg( m_partition->partitionPath() );
- if ( op.execute( report ) )
- {
- return Calamares::JobResult::ok();
- }
-
- return Calamares::JobResult::error( errorMessage, report.toText() );
+ return KPMHelpers::execute(
+ op, tr( "The installer failed to set flags on partition %1." ).arg( m_partition->partitionPath() ) );
}
diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp
index 45a7b4f12..103fe6f82 100644
--- a/src/modules/partition/tests/AutoMountTests.cpp
+++ b/src/modules/partition/tests/AutoMountTests.cpp
@@ -69,8 +69,8 @@ AutoMountJobTests::testRunQueue()
QVERIFY( !q.isRunning() );
QEventLoop loop;
- QTimer::singleShot( std::chrono::milliseconds( 100 ), [&q]() { q.start(); } );
- QTimer::singleShot( std::chrono::milliseconds( 5000 ), [&loop]() { loop.quit(); } );
+ QTimer::singleShot( std::chrono::milliseconds( 100 ), [ &q ]() { q.start(); } );
+ QTimer::singleShot( std::chrono::milliseconds( 5000 ), [ &loop ]() { loop.quit(); } );
connect( &q, &Calamares::JobQueue::finished, &loop, &QEventLoop::quit );
loop.exec();
diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt
index 2839270fb..da017d96f 100644
--- a/src/modules/partition/tests/CMakeLists.txt
+++ b/src/modules/partition/tests/CMakeLists.txt
@@ -61,6 +61,7 @@ calamares_add_test(
SOURCES
${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp
AutoMountTests.cpp
+ DEFINITIONS ${_partition_defs}
)
calamares_add_test(
@@ -70,4 +71,5 @@ calamares_add_test(
${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp
LIBRARIES
kpmcore
+ DEFINITIONS ${_partition_defs}
)
diff --git a/src/modules/partition/tests/ClearMountsJobTests.cpp b/src/modules/partition/tests/ClearMountsJobTests.cpp
index 3af400fde..17565e756 100644
--- a/src/modules/partition/tests/ClearMountsJobTests.cpp
+++ b/src/modules/partition/tests/ClearMountsJobTests.cpp
@@ -32,10 +32,10 @@ getPartitionsForDevice_other( const QString& deviceName )
{
QProcess process;
process.setProgram( "sh" );
- process.setArguments(
- { "-c",
- QString( "echo $(awk '{print \"/dev/\"$4}' /proc/partitions | sed -e '/name/d' -e '/^$/d' -e '/[1-9]/!d' | grep %1)" )
- .arg( deviceName ) } );
+ process.setArguments( { "-c",
+ QString( "echo $(awk '{print \"/dev/\"$4}' /proc/partitions | sed -e '/name/d' -e '/^$/d' "
+ "-e '/[1-9]/!d' | grep %1)" )
+ .arg( deviceName ) } );
process.start();
process.waitForFinished();
diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt
index 820c50a2b..5df637321 100644
--- a/src/modules/preservefiles/CMakeLists.txt
+++ b/src/modules/preservefiles/CMakeLists.txt
@@ -3,14 +3,20 @@
# SPDX-FileCopyrightText: 2020 Adriaan de Groot
# SPDX-License-Identifier: BSD-2-Clause
#
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
-
calamares_add_plugin( preservefiles
TYPE job
EXPORT_MACRO PLUGINDLLEXPORT_PRO
SOURCES
+ Item.cpp
PreserveFiles.cpp
# REQUIRES mount # To set the rootMountPoint
SHARED_LIB
EMERGENCY
)
+
+calamares_add_test(
+ preservefilestest
+ SOURCES
+ Item.cpp
+ Tests.cpp
+)
diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp
new file mode 100644
index 000000000..2ae929e67
--- /dev/null
+++ b/src/modules/preservefiles/Item.cpp
@@ -0,0 +1,159 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2018, 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#include "Item.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Units.h"
+#include "utils/Variant.h"
+
+#include
+
+using namespace CalamaresUtils::Units;
+
+static bool
+copy_file( const QString& source, const QString& dest )
+{
+ QFile sourcef( source );
+ if ( !sourcef.open( QFile::ReadOnly ) )
+ {
+ cWarning() << "Could not read" << source;
+ return false;
+ }
+
+ QFile destf( dest );
+ if ( !destf.open( QFile::WriteOnly ) )
+ {
+ sourcef.close();
+ cWarning() << "Could not open" << destf.fileName() << "for writing; could not copy" << source;
+ return false;
+ }
+
+ QByteArray b;
+ do
+ {
+ b = sourcef.read( 1_MiB );
+ destf.write( b );
+ } while ( b.count() > 0 );
+
+ sourcef.close();
+ destf.close();
+
+ return true;
+}
+
+Item
+Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions )
+{
+ if ( v.type() == QVariant::String )
+ {
+ QString filename = v.toString();
+ if ( !filename.isEmpty() )
+ {
+ return { filename, filename, defaultPermissions, ItemType::Path, false };
+ }
+ else
+ {
+ cWarning() << "Empty filename for preservefiles, item" << v;
+ return {};
+ }
+ }
+ else if ( v.type() == QVariant::Map )
+ {
+ const auto map = v.toMap();
+
+ CalamaresUtils::Permissions perm( defaultPermissions );
+ ItemType t = ItemType::None;
+ bool optional = CalamaresUtils::getBool( map, "optional", false );
+
+ {
+ QString perm_string = map[ "perm" ].toString();
+ if ( !perm_string.isEmpty() )
+ {
+ perm = CalamaresUtils::Permissions( perm_string );
+ }
+ }
+
+ {
+ QString from = map[ "from" ].toString();
+ t = ( from == "log" ) ? ItemType::Log : ( from == "config" ) ? ItemType::Config : ItemType::None;
+
+ if ( t == ItemType::None && !map[ "src" ].toString().isEmpty() )
+ {
+ t = ItemType::Path;
+ }
+ }
+
+ QString dest = map[ "dest" ].toString();
+ if ( dest.isEmpty() )
+ {
+ cWarning() << "Empty dest for preservefiles, item" << v;
+ return {};
+ }
+
+ switch ( t )
+ {
+ case ItemType::Config:
+ return { QString(), dest, perm, t, optional };
+ case ItemType::Log:
+ return { QString(), dest, perm, t, optional };
+ case ItemType::Path:
+ return { map[ "src" ].toString(), dest, perm, t, optional };
+ case ItemType::None:
+ cWarning() << "Invalid type for preservefiles, item" << v;
+ return {};
+ }
+ }
+ cWarning() << "Invalid type for preservefiles, item" << v;
+ return {};
+}
+
+
+bool
+Item::exec( const std::function< QString( QString ) >& replacements ) const
+{
+ QString expanded_dest = replacements( dest );
+ QString full_dest = CalamaresUtils::System::instance()->targetPath( expanded_dest );
+
+ bool success = false;
+ switch ( m_type )
+ {
+ case ItemType::None:
+ cWarning() << "Invalid item for preservefiles skipped.";
+ return false;
+ case ItemType::Config:
+ if ( !( success = Calamares::JobQueue::instance()->globalStorage()->saveJson( full_dest ) ) )
+ {
+ cWarning() << "Could not write a JSON dump of global storage to" << full_dest;
+ }
+ break;
+ case ItemType::Log:
+ if ( !( success = copy_file( Logger::logFile(), full_dest ) ) )
+ {
+ cWarning() << "Could not preserve log file to" << full_dest;
+ }
+ break;
+ case ItemType::Path:
+ if ( !( success = copy_file( source, full_dest ) ) )
+ {
+ cWarning() << "Could not preserve" << source << "to" << full_dest;
+ }
+ break;
+ }
+ if ( !success )
+ {
+ CalamaresUtils::System::instance()->removeTargetFile( expanded_dest );
+ return false;
+ }
+ else
+ {
+ return perm.apply( full_dest );
+ }
+}
diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h
new file mode 100644
index 000000000..896b9471f
--- /dev/null
+++ b/src/modules/preservefiles/Item.h
@@ -0,0 +1,76 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2018, 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+#ifndef PRESERVEFILES_ITEM_H
+#define PRESERVEFILES_ITEM_H
+
+#include "utils/Permissions.h"
+
+#include
+#include
+
+#include
+
+enum class ItemType
+{
+ None,
+ Path,
+ Log,
+ Config
+};
+
+/** @brief Represents one item to copy
+ *
+ * All item types need a destination (to place the data), this is
+ * intepreted within the target system. All items need a permission,
+ * which is applied to the data once written.
+ *
+ * The source may be a path, but not all types need a source.
+ */
+class Item
+{
+ QString source;
+ QString dest;
+ CalamaresUtils::Permissions perm;
+ ItemType m_type = ItemType::None;
+ bool m_optional = false;
+
+public:
+ Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t, bool optional )
+ : source( src )
+ , dest( d )
+ , perm( std::move( p ) )
+ , m_type( t )
+ , m_optional( optional )
+ {
+ }
+
+ Item()
+ : m_type( ItemType::None )
+ {
+ }
+
+ operator bool() const { return m_type != ItemType::None; }
+ ItemType type() const { return m_type; }
+ bool isOptional() const { return m_optional; }
+
+ bool exec( const std::function< QString( QString ) >& replacements ) const;
+
+
+ /** @brief Create an Item -- or one of its subclasses -- from @p v
+ *
+ * Depending on the structure and contents of @p v, a pointer
+ * to an Item is returned. If @p v cannot be interpreted meaningfully,
+ * then a nullptr is returned.
+ *
+ * When the entry contains a *perm* key, use that permission, otherwise
+ * apply @p defaultPermissions to the item.
+ */
+ static Item fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions );
+};
+
+
+#endif
diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp
index b235aac93..f904ded8c 100644
--- a/src/modules/preservefiles/PreserveFiles.cpp
+++ b/src/modules/preservefiles/PreserveFiles.cpp
@@ -7,46 +7,20 @@
#include "PreserveFiles.h"
+#include "Item.h"
+
#include "CalamaresVersion.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/CommandList.h"
#include "utils/Logger.h"
-#include "utils/Permissions.h"
#include "utils/Units.h"
#include
using namespace CalamaresUtils::Units;
-QString
-targetPrefix()
-{
- if ( CalamaresUtils::System::instance()->doChroot() )
- {
- Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
- if ( gs && gs->contains( "rootMountPoint" ) )
- {
- QString r = gs->value( "rootMountPoint" ).toString();
- if ( !r.isEmpty() )
- {
- return r;
- }
- else
- {
- cDebug() << "RootMountPoint is empty";
- }
- }
- else
- {
- cDebug() << "No rootMountPoint defined, preserving files to '/'";
- }
- }
-
- return QLatin1String( "/" );
-}
-
QString
atReplacements( QString s )
{
@@ -79,95 +53,34 @@ PreserveFiles::prettyName() const
return tr( "Saving files for later ..." );
}
-static bool
-copy_file( const QString& source, const QString& dest )
-{
- QFile sourcef( source );
- if ( !sourcef.open( QFile::ReadOnly ) )
- {
- cWarning() << "Could not read" << source;
- return false;
- }
-
- QFile destf( dest );
- if ( !destf.open( QFile::WriteOnly ) )
- {
- sourcef.close();
- cWarning() << "Could not open" << destf.fileName() << "for writing; could not copy" << source;
- return false;
- }
-
- QByteArray b;
- do
- {
- b = sourcef.read( 1_MiB );
- destf.write( b );
- } while ( b.count() > 0 );
-
- sourcef.close();
- destf.close();
-
- return true;
-}
-
Calamares::JobResult
PreserveFiles::exec()
{
- if ( m_items.isEmpty() )
+ if ( m_items.empty() )
{
return Calamares::JobResult::error( tr( "No files configured to save for later." ) );
}
- QString prefix = targetPrefix();
- if ( !prefix.endsWith( '/' ) )
- {
- prefix.append( '/' );
- }
-
int count = 0;
- for ( const auto& it : m_items )
+ for ( const auto& it : qAsConst( m_items ) )
{
- QString source = it.source;
- QString bare_dest = atReplacements( it.dest );
- QString dest = prefix + bare_dest;
-
- if ( it.type == ItemType::Log )
+ if ( !it )
{
- source = Logger::logFile();
+ // Invalid entries are nullptr, ignore them but count as a success
+ // because they shouldn't block the installation. There are
+ // warnings in the log showing what the configuration problem is.
+ ++count;
+ continue;
}
- if ( it.type == ItemType::Config )
+ // Try to preserve the file. If it's marked as optional, count it
+ // as a success regardless.
+ if ( it.exec( atReplacements ) || it.isOptional() )
{
- if ( !Calamares::JobQueue::instance()->globalStorage()->saveJson( dest ) )
- {
- cWarning() << "Could not write a JSON dump of global storage to" << dest;
- }
- else
- {
- ++count;
- }
- }
- else if ( source.isEmpty() )
- {
- cWarning() << "Skipping unnamed source file for" << dest;
- }
- else
- {
- if ( copy_file( source, dest ) )
- {
- if ( it.perm.isValid() )
- {
- if ( !it.perm.apply( CalamaresUtils::System::instance()->targetPath( bare_dest ) ) )
- {
- cWarning() << "Could not set attributes of" << bare_dest;
- }
- }
-
- ++count;
- }
+ ++count;
}
}
- return count == m_items.count()
+ return count == m_items.size()
? Calamares::JobResult::ok()
: Calamares::JobResult::error( tr( "Not all of the configured files could be preserved." ) );
}
@@ -193,53 +106,11 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap )
{
defaultPermissions = QStringLiteral( "root:root:0400" );
}
+ CalamaresUtils::Permissions perm( defaultPermissions );
- QVariantList l = files.toList();
- unsigned int c = 0;
- for ( const auto& li : l )
+ for ( const auto& li : files.toList() )
{
- if ( li.type() == QVariant::String )
- {
- QString filename = li.toString();
- if ( !filename.isEmpty() )
- m_items.append(
- Item { filename, filename, CalamaresUtils::Permissions( defaultPermissions ), ItemType::Path } );
- else
- {
- cDebug() << "Empty filename for preservefiles, item" << c;
- }
- }
- else if ( li.type() == QVariant::Map )
- {
- const auto map = li.toMap();
- QString dest = map[ "dest" ].toString();
- QString from = map[ "from" ].toString();
- ItemType t = ( from == "log" ) ? ItemType::Log : ( from == "config" ) ? ItemType::Config : ItemType::None;
- QString perm = map[ "perm" ].toString();
- if ( perm.isEmpty() )
- {
- perm = defaultPermissions;
- }
-
- if ( dest.isEmpty() )
- {
- cDebug() << "Empty dest for preservefiles, item" << c;
- }
- else if ( t == ItemType::None )
- {
- cDebug() << "Invalid type for preservefiles, item" << c;
- }
- else
- {
- m_items.append( Item { QString(), dest, CalamaresUtils::Permissions( perm ), t } );
- }
- }
- else
- {
- cDebug() << "Invalid type for preservefiles, item" << c;
- }
-
- ++c;
+ m_items.push_back( Item::fromVariant( li, perm ) );
}
}
diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h
index 7a0aab34d..dfd2804e3 100644
--- a/src/modules/preservefiles/PreserveFiles.h
+++ b/src/modules/preservefiles/PreserveFiles.h
@@ -10,33 +10,14 @@
#include "CppJob.h"
#include "DllMacro.h"
-#include "utils/Permissions.h"
#include "utils/PluginFactory.h"
-#include
-#include
-#include
+class Item;
class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob
{
Q_OBJECT
- enum class ItemType
- {
- None,
- Path,
- Log,
- Config
- };
-
- struct Item
- {
- QString source;
- QString dest;
- CalamaresUtils::Permissions perm;
- ItemType type;
- };
-
using ItemList = QList< Item >;
public:
diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp
new file mode 100644
index 000000000..57cefcf9d
--- /dev/null
+++ b/src/modules/preservefiles/Tests.cpp
@@ -0,0 +1,93 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "Item.h"
+
+#include "Settings.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/NamedEnum.h"
+#include "utils/Yaml.h"
+
+#include
+
+class PreserveFilesTests : public QObject
+{
+ Q_OBJECT
+public:
+ PreserveFilesTests();
+ ~PreserveFilesTests() override {}
+
+private Q_SLOTS:
+ void initTestCase();
+
+ void testItems_data();
+ void testItems();
+};
+
+PreserveFilesTests::PreserveFilesTests() {}
+
+void
+PreserveFilesTests::initTestCase()
+{
+ Logger::setupLogLevel( Logger::LOGDEBUG );
+ cDebug() << "PreserveFiles test started.";
+
+ // Ensure we have a system object, expect it to be a "bogus" one
+ CalamaresUtils::System* system = CalamaresUtils::System::instance();
+ QVERIFY( system );
+ cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system );
+
+ const auto* settings = Calamares::Settings::instance();
+ if ( !settings )
+ {
+ (void)new Calamares::Settings( true );
+ }
+}
+
+void
+PreserveFilesTests::testItems_data()
+{
+ QTest::addColumn< QString >( "filename" );
+ QTest::addColumn< bool >( "ok" );
+ QTest::addColumn< int >( "type_i" );
+
+ QTest::newRow( "log " ) << QString( "1a-log.conf" ) << true << smash( ItemType::Log );
+ QTest::newRow( "config " ) << QString( "1b-config.conf" ) << true << smash( ItemType::Config );
+ QTest::newRow( "src " ) << QString( "1c-src.conf" ) << true << smash( ItemType::Path );
+ QTest::newRow( "filename" ) << QString( "1d-filename.conf" ) << true << smash( ItemType::Path );
+ QTest::newRow( "empty " ) << QString( "1e-empty.conf" ) << false << smash( ItemType::None );
+ QTest::newRow( "bad " ) << QString( "1f-bad.conf" ) << false << smash( ItemType::None );
+}
+
+void
+PreserveFilesTests::testItems()
+{
+ QFETCH( QString, filename );
+ QFETCH( bool, ok );
+ QFETCH( int, type_i );
+
+ QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) );
+ QVERIFY( fi.exists() );
+
+ bool config_file_ok = false;
+ const auto map = CalamaresUtils::loadYaml( fi, &config_file_ok );
+ QVERIFY( config_file_ok );
+
+ CalamaresUtils::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) );
+ auto i = Item::fromVariant( map[ "item" ], perm );
+ QCOMPARE( bool( i ), ok );
+ QCOMPARE( smash( i.type() ), type_i );
+}
+
+QTEST_GUILESS_MAIN( PreserveFilesTests )
+
+#include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf
index 6af0872d7..4fb393b2e 100644
--- a/src/modules/preservefiles/preservefiles.conf
+++ b/src/modules/preservefiles/preservefiles.conf
@@ -7,42 +7,58 @@
# the list should have one of these forms:
#
# - an absolute path (probably within the host system). This will be preserved
-# as the same path within the target system (chroot). If, globally, dontChroot
-# is true, then these items are ignored (since the destination is the same
-# as the source).
+# as the same path within the target system (chroot). If, globally,
+# *dontChroot* is true, then these items will be ignored (since the
+# destination is the same as the source).
# - a map with a *dest* key. The *dest* value is a path interpreted in the
-# target system (if dontChroot is true, in the host system). Relative paths
-# are not recommended. There are three possible other keys in the map:
+# target system (if the global *dontChroot* is true, then the host is the
+# target as well). Relative paths are not recommended. There are two
+# ways to select the source data for the file:
# - *from*, which must have one of the values, below; it is used to
# preserve files whose pathname is known to Calamares internally.
# - *src*, to refer to a path interpreted in the host system. Relative
# paths are not recommended, and are interpreted relative to where
# Calamares is being run.
+# Exactly one of the two source keys (either *from* or *src*) must be set.
+#
+# Special values for the key *from* are:
+# - *log*, for the complete log file (up to the moment the preservefiles
+# module is run),
+# - *config*, for a JSON dump of the contents of global storage.
+# Note that this may contain sensitive information, and should be
+# given restrictive permissions.
+#
+# A map with a *dest* key can have these additional fields:
# - *perm*, is a colon-separated tuple of ::
# where is in octal (e.g. 4777 for wide-open, 0400 for read-only
# by owner). If set, the file's ownership and permissions are set to
# those values within the target system; if not set, no permissions
# are changed.
-# Only one of the two source keys (either *from* or *src*) may be set.
+# - *optional*, is a boolean; if this is set to `true` then failure to
+# preserve the file will **not** be counted as a failure of the
+# module, and installation will proceed. Set this for files that might
+# not exist in the host system (e.g. nvidia configuration files that
+# are created in some boot scenarios and not in others).
#
-# The target filename is modified as follows:
-# - `@@ROOT@@` is replaced by the path to the target root (may be /)
+# The target path (*dest*) is modified as follows:
+# - `@@ROOT@@` is replaced by the path to the target root (may be /).
+# There is never any reason to use this, since the *dest* is already
+# interpreted in the target system.
# - `@@USER@@` is replaced by the username entered by on the user
# page (may be empty, for instance if no user page is enabled)
#
-# Special values for the key *from* are:
-# - *log*, for the complete log file (up to the moment the preservefiles
-# module is run),
-# - *config*, for a JSON dump of the contents of global storage
----
+#
+#
files:
- - /etc/oem-information
- from: log
- dest: /root/install.log
- perm: root:wheel:644
+ dest: /var/log/Calamares.log
+ perm: root:wheel:600
- from: config
- dest: /root/install.json
- perm: root:wheel:400
+ dest: /var/log/Calamares-install.json
+ perm: root:wheel:600
+# - src: /var/log/nvidia.conf
+# dest: /var/log/Calamares-nvidia.conf
+# optional: true
# The *perm* key contains a default value to apply to all files listed
# above that do not have a *perm* key of their own. If not set,
diff --git a/src/modules/preservefiles/preservefiles.schema.yaml b/src/modules/preservefiles/preservefiles.schema.yaml
new file mode 100644
index 000000000..65067ea97
--- /dev/null
+++ b/src/modules/preservefiles/preservefiles.schema.yaml
@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2020 Adriaan de Groot
+# SPDX-License-Identifier: GPL-3.0-or-later
+---
+$schema: https://json-schema.org/schema#
+$id: https://calamares.io/schemas/preservefiles
+additionalProperties: false
+type: object
+properties:
+ # TODO: it's a particularly-formatted string
+ perm: { type: string }
+ files:
+ type: array
+ items:
+ # There are three entries here because: string, or an entry with
+ # a src (but no from) or an entry with from (but no src).
+ anyOf:
+ - type: string
+ - type: object
+ properties:
+ dest: { type: string }
+ src: { type: string }
+ # TODO: it's a particularly-formatted string
+ perm: { type: string }
+ optional: { type: boolean }
+ required: [ dest ]
+ additionalProperties: false
+ - type: object
+ properties:
+ dest: { type: string }
+ from: { type: string, enum: [config, log] }
+ # TODO: it's a particularly-formatted string
+ perm: { type: string }
+ optional: { type: boolean }
+ required: [ dest ]
+ additionalProperties: false
+
+required: [ files ]
diff --git a/src/modules/preservefiles/tests/1a-log.conf b/src/modules/preservefiles/tests/1a-log.conf
new file mode 100644
index 000000000..d589d4dfb
--- /dev/null
+++ b/src/modules/preservefiles/tests/1a-log.conf
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+item:
+ from: log
+ dest: /var/log/Calamares.log
+ perm: root:wheel:601
diff --git a/src/modules/preservefiles/tests/1b-config.conf b/src/modules/preservefiles/tests/1b-config.conf
new file mode 100644
index 000000000..409dc89d9
--- /dev/null
+++ b/src/modules/preservefiles/tests/1b-config.conf
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+item:
+ from: config
+ dest: /var/log/Calamares-install.json
+ perm: root:wheel:600
diff --git a/src/modules/preservefiles/tests/1c-src.conf b/src/modules/preservefiles/tests/1c-src.conf
new file mode 100644
index 000000000..130ddd06f
--- /dev/null
+++ b/src/modules/preservefiles/tests/1c-src.conf
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+item:
+ src: /root/.cache/calamares/session.log
+ dest: /var/log/Calamares.log
+ perm: root:wheel:600
diff --git a/src/modules/preservefiles/tests/1d-filename.conf b/src/modules/preservefiles/tests/1d-filename.conf
new file mode 100644
index 000000000..130ddd06f
--- /dev/null
+++ b/src/modules/preservefiles/tests/1d-filename.conf
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+item:
+ src: /root/.cache/calamares/session.log
+ dest: /var/log/Calamares.log
+ perm: root:wheel:600
diff --git a/src/modules/preservefiles/tests/1e-empty.conf b/src/modules/preservefiles/tests/1e-empty.conf
new file mode 100644
index 000000000..183d4e456
--- /dev/null
+++ b/src/modules/preservefiles/tests/1e-empty.conf
@@ -0,0 +1,3 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+item: []
diff --git a/src/modules/preservefiles/tests/1f-bad.conf b/src/modules/preservefiles/tests/1f-bad.conf
new file mode 100644
index 000000000..b2c008955
--- /dev/null
+++ b/src/modules/preservefiles/tests/1f-bad.conf
@@ -0,0 +1,4 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+item:
+ bop: 1
diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index 5e3cd12b5..7430bd57b 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -19,6 +19,8 @@
#include
+#include
+
#include
@@ -37,7 +39,6 @@ namespace
*/
class TrackingInstallJob : public Calamares::Job
{
- Q_OBJECT
public:
TrackingInstallJob( const QString& url );
~TrackingInstallJob() override;
@@ -58,7 +59,6 @@ private:
*/
class TrackingMachineUpdateManagerJob : public Calamares::Job
{
- Q_OBJECT
public:
~TrackingMachineUpdateManagerJob() override;
@@ -75,7 +75,6 @@ public:
*/
class TrackingKUserFeedbackJob : public Calamares::Job
{
- Q_OBJECT
public:
TrackingKUserFeedbackJob( const QString& username, const QStringList& areas );
~TrackingKUserFeedbackJob() override;
@@ -99,13 +98,13 @@ TrackingInstallJob::~TrackingInstallJob() {}
QString
TrackingInstallJob::prettyName() const
{
- return tr( "Installation feedback" );
+ return QCoreApplication::translate( "TrackingInstallJob", "Installation feedback" );
}
QString
TrackingInstallJob::prettyStatusMessage() const
{
- return tr( "Sending installation feedback." );
+ return QCoreApplication::translate( "TrackingInstallJob", "Sending installation feedback." );
}
Calamares::JobResult
@@ -122,8 +121,9 @@ TrackingInstallJob::exec()
if ( result.status == RequestStatus::Timeout )
{
cWarning() << "install-tracking request timed out.";
- return Calamares::JobResult::error( tr( "Internal error in install-tracking." ),
- tr( "HTTP request timed out." ) );
+ return Calamares::JobResult::error(
+ QCoreApplication::translate( "TrackingInstallJob", "Internal error in install-tracking." ),
+ QCoreApplication::translate( "TrackingInstallJob", "HTTP request timed out." ) );
}
return Calamares::JobResult::ok();
}
@@ -133,13 +133,13 @@ TrackingMachineUpdateManagerJob::~TrackingMachineUpdateManagerJob() {}
QString
TrackingMachineUpdateManagerJob::prettyName() const
{
- return tr( "Machine feedback" );
+ return QCoreApplication::translate( "TrackingMachineUpdateManagerJob", "Machine feedback" );
}
QString
TrackingMachineUpdateManagerJob::prettyStatusMessage() const
{
- return tr( "Configuring machine feedback." );
+ return QCoreApplication::translate( "TrackingMachineUpdateManagerJob", "Configuring machine feedback." );
}
Calamares::JobResult
@@ -162,14 +162,20 @@ TrackingMachineUpdateManagerJob::exec()
else if ( r > 0 )
{
return Calamares::JobResult::error(
- tr( "Error in machine feedback configuration." ),
- tr( "Could not configure machine feedback correctly, script error %1." ).arg( r ) );
+ QCoreApplication::translate( "TrackingMachineUpdateManagerJob",
+ "Error in machine feedback configuration." ),
+ QCoreApplication::translate( "TrackingMachineUpdateManagerJob",
+ "Could not configure machine feedback correctly, script error %1." )
+ .arg( r ) );
}
else
{
return Calamares::JobResult::error(
- tr( "Error in machine feedback configuration." ),
- tr( "Could not configure machine feedback correctly, Calamares error %1." ).arg( r ) );
+ QCoreApplication::translate( "TrackingMachineUpdateManagerJob",
+ "Error in machine feedback configuration." ),
+ QCoreApplication::translate( "TrackingMachineUpdateManagerJob",
+ "Could not configure machine feedback correctly, Calamares error %1." )
+ .arg( r ) );
}
}
@@ -184,13 +190,13 @@ TrackingKUserFeedbackJob::~TrackingKUserFeedbackJob() {}
QString
TrackingKUserFeedbackJob::prettyName() const
{
- return tr( "KDE user feedback" );
+ return QCoreApplication::translate( "TrackingKUserFeedbackJob", "KDE user feedback" );
}
QString
TrackingKUserFeedbackJob::prettyStatusMessage() const
{
- return tr( "Configuring KDE user feedback." );
+ return QCoreApplication::translate( "TrackingKUserFeedbackJob", "Configuring KDE user feedback." );
}
Calamares::JobResult
@@ -212,21 +218,25 @@ FeedbackLevel=16
if ( r > 0 )
{
return Calamares::JobResult::error(
- tr( "Error in KDE user feedback configuration." ),
- tr( "Could not configure KDE user feedback correctly, script error %1." ).arg( r ) );
+ QCoreApplication::translate( "TrackingKUserFeedbackJob", "Error in KDE user feedback configuration." ),
+ QCoreApplication::translate( "TrackingKUserFeedbackJob",
+ "Could not configure KDE user feedback correctly, script error %1." )
+ .arg( r ) );
}
else if ( r < 0 )
{
return Calamares::JobResult::error(
- tr( "Error in KDE user feedback configuration." ),
- tr( "Could not configure KDE user feedback correctly, Calamares error %1." ).arg( r ) );
+ QCoreApplication::translate( "TrackingKUserFeedbackJob", "Error in KDE user feedback configuration." ),
+ QCoreApplication::translate( "TrackingKUserFeedbackJob",
+ "Could not configure KDE user feedback correctly, Calamares error %1." )
+ .arg( r ) );
}
}
return Calamares::JobResult::ok();
}
-} // namespace
+} // namespace
void
addJob( Calamares::JobList& list, InstallTrackingConfig* config )
@@ -290,7 +300,3 @@ addJob( Calamares::JobList& list, UserTrackingConfig* config )
}
}
}
-
-#include "utils/moc-warnings.h"
-
-#include "TrackingJobs.moc"
diff --git a/src/modules/umount/CMakeLists.txt b/src/modules/umount/CMakeLists.txt
new file mode 100644
index 000000000..d72847007
--- /dev/null
+++ b/src/modules/umount/CMakeLists.txt
@@ -0,0 +1,19 @@
+# === This file is part of Calamares - ===
+#
+# SPDX-FileCopyrightText: 2021 Adriaan de Groot
+# SPDX-License-Identifier: BSD-2-Clause
+#
+calamares_add_plugin( umount
+ TYPE job
+ EXPORT_MACRO PLUGINDLLEXPORT_PRO
+ SOURCES
+ UmountJob.cpp
+ SHARED_LIB
+ EMERGENCY
+)
+
+calamares_add_test(
+ umounttest
+ SOURCES
+ Tests.cpp
+)
diff --git a/src/modules/umount/Tests.cpp b/src/modules/umount/Tests.cpp
new file mode 100644
index 000000000..dc0198619
--- /dev/null
+++ b/src/modules/umount/Tests.cpp
@@ -0,0 +1,52 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "UmountJob.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+
+#include
+#include
+#include
+
+// Internals of UmountJob.cpp
+
+// Actual tests
+class UmountTests : public QObject
+{
+ Q_OBJECT
+public:
+ UmountTests() {}
+ ~UmountTests() override {}
+
+private Q_SLOTS:
+ void initTestCase();
+ void testTrue();
+};
+
+void
+UmountTests::initTestCase()
+{
+ Logger::setupLogLevel( Logger::LOGDEBUG );
+}
+
+void
+UmountTests::testTrue()
+{
+ QVERIFY( true );
+}
+
+QTEST_GUILESS_MAIN( UmountTests )
+
+#include "utils/moc-warnings.h"
+
+#include "Tests.moc"
diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp
new file mode 100644
index 000000000..b9d92fa87
--- /dev/null
+++ b/src/modules/umount/UmountJob.cpp
@@ -0,0 +1,158 @@
+/* === This file is part of Calamares - ===
+ *
+ * Tags from the Python version of this module:
+ * SPDX-FileCopyrightText: 2014 Aurélien Gâteau
+ * SPDX-FileCopyrightText: 2016 Anke Boersma
+ * SPDX-FileCopyrightText: 2018 Adriaan de Groot
+ * Tags for the C++ version of this module:
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "UmountJob.h"
+
+#include "partition/Mount.h"
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Variant.h"
+
+#include "GlobalStorage.h"
+#include "JobQueue.h"
+
+#include
+#include
+#include
+
+UmountJob::UmountJob( QObject* parent )
+ : Calamares::CppJob( parent )
+{
+}
+
+UmountJob::~UmountJob() {}
+
+QString
+UmountJob::prettyName() const
+{
+ return tr( "Unmount file systems." );
+}
+
+static Calamares::JobResult
+unmountTargetMounts( const QString& rootMountPoint )
+{
+ QDir targetMount( rootMountPoint );
+ if ( !targetMount.exists() )
+ {
+ return Calamares::JobResult::internalError(
+ QCoreApplication::translate( UmountJob::staticMetaObject.className(), "Could not unmount target system." ),
+ QCoreApplication::translate( UmountJob::staticMetaObject.className(),
+ "The target system is not mounted at '%1'." )
+ .arg( rootMountPoint ),
+ Calamares::JobResult::GenericError );
+ }
+ QString targetMountPath = targetMount.absolutePath();
+ if ( !targetMountPath.endsWith( '/' ) )
+ {
+ targetMountPath.append( '/' );
+ }
+
+ using MtabInfo = CalamaresUtils::Partition::MtabInfo;
+ auto targetMounts = MtabInfo::fromMtabFilteredByPrefix( targetMountPath );
+ std::sort( targetMounts.begin(), targetMounts.end(), MtabInfo::mountPointOrder );
+
+ for ( const auto& m : qAsConst( targetMounts ) )
+ {
+ if ( CalamaresUtils::Partition::unmount( m.mountPoint, { "-lv" } ) )
+ {
+ // Returns the program's exit code, so 0 is success
+ return Calamares::JobResult::error(
+ QCoreApplication::translate( UmountJob::staticMetaObject.className(),
+ "Could not unmount target system." ),
+ QCoreApplication::translate( UmountJob::staticMetaObject.className(),
+ "The device '%1' is mounted in the target system. It is mounted at '%2'. "
+ "The device could not be unmounted." )
+ .arg( m.device, m.mountPoint ) );
+ }
+ }
+ return Calamares::JobResult::ok();
+}
+
+static Calamares::JobResult
+exportZFSPools( const QString& rootMountPoint )
+{
+ auto* gs = Calamares::JobQueue::instance()->globalStorage();
+ QStringList poolNames;
+ {
+ // The pools are dictionaries / VariantMaps
+ auto zfs_pool_list = gs->value( "zfsPoolInfo" ).toList();
+ for ( const auto& v : zfs_pool_list )
+ {
+ auto m = v.toMap();
+ QString poolName = m.value( "poolName" ).toString();
+ if ( !poolName.isEmpty() )
+ {
+ poolNames.append( poolName );
+ }
+ }
+ poolNames.sort();
+ }
+
+ for ( const auto& poolName : poolNames )
+ {
+ auto result = CalamaresUtils::System::runCommand( { "zpool", "export", poolName }, std::chrono::seconds( 30 ) );
+ if ( result.getExitCode() )
+ {
+ cWarning() << "Failed to export pool" << result.getOutput();
+ }
+ }
+ // Exporting ZFS pools does not cause the install to fail
+ return Calamares::JobResult::ok();
+}
+
+
+Calamares::JobResult
+UmountJob::exec()
+{
+ const auto* sys = CalamaresUtils::System::instance();
+ if ( !sys )
+ {
+ return Calamares::JobResult::internalError(
+ "UMount", tr( "No target system available." ), Calamares::JobResult::InvalidConfiguration );
+ }
+
+ Calamares::GlobalStorage* gs
+ = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+ if ( !gs || gs->value( "rootMountPoint" ).toString().isEmpty() )
+ {
+ return Calamares::JobResult::internalError(
+ "UMount", tr( "No rootMountPoint is set." ), Calamares::JobResult::InvalidConfiguration );
+ }
+
+ // Do the unmounting of target-system filesystems
+ {
+ auto r = unmountTargetMounts( gs->value( "rootMountPoint" ).toString() );
+ if ( !r )
+ {
+ return r;
+ }
+ }
+ // For ZFS systems, export the pools
+ {
+ auto r = exportZFSPools( gs->value( "rootMountPoint" ).toString() );
+ if ( !r )
+ {
+ return r;
+ }
+ }
+
+ return Calamares::JobResult::ok();
+}
+
+void
+UmountJob::setConfigurationMap( const QVariantMap& map )
+{
+}
+
+CALAMARES_PLUGIN_FACTORY_DEFINITION( UmountJobFactory, registerPlugin< UmountJob >(); )
diff --git a/src/modules/umount/UmountJob.h b/src/modules/umount/UmountJob.h
new file mode 100644
index 000000000..6ca5428bc
--- /dev/null
+++ b/src/modules/umount/UmountJob.h
@@ -0,0 +1,41 @@
+/* === This file is part of Calamares - ===
+ *
+ * SPDX-FileCopyrightText: 2021 Adriaan de Groot
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ * Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef UMOUNTJOB_H
+#define UMOUNTJOB_H
+
+#include "CppJob.h"
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+
+#include
+#include
+#include
+
+/** @brief Write 'random' data: machine id, entropy, UUIDs
+ *
+ */
+class PLUGINDLLEXPORT UmountJob : public Calamares::CppJob
+{
+ Q_OBJECT
+
+public:
+ explicit UmountJob( QObject* parent = nullptr );
+ ~UmountJob() override;
+
+ QString prettyName() const override;
+
+ Calamares::JobResult exec() override;
+
+ void setConfigurationMap( const QVariantMap& configurationMap ) override;
+};
+
+CALAMARES_PLUGIN_FACTORY_DECLARATION( UmountJobFactory )
+
+#endif // UMOUNTJOB_H
diff --git a/src/modules/umount/main.py b/src/modules/umount/main.py
deleted file mode 100644
index 77ea91e34..000000000
--- a/src/modules/umount/main.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# === This file is part of Calamares - ===
-#
-# SPDX-FileCopyrightText: 2014 Aurélien Gâteau
-# SPDX-FileCopyrightText: 2016 Anke Boersma
-# SPDX-FileCopyrightText: 2018 Adriaan de Groot
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# Calamares is Free Software: see the License-Identifier above.
-#
-
-import os
-import subprocess
-import shutil
-
-import libcalamares
-from libcalamares.utils import gettext_path, gettext_languages
-
-import gettext
-_translation = gettext.translation("calamares-python",
- localedir=gettext_path(),
- languages=gettext_languages(),
- fallback=True)
-_ = _translation.gettext
-_n = _translation.ngettext
-
-
-def pretty_name():
- return _( "Unmount file systems." )
-
-
-def list_mounts(root_mount_point):
- """ List mount points.
-
- :param root_mount_point:
- :return:
- """
- lst = []
-
- root_mount_point = os.path.normpath(root_mount_point)
- for line in open("/etc/mtab").readlines():
- device, mount_point, _ = line.split(" ", 2)
-
- if os.path.commonprefix([root_mount_point, mount_point]) == root_mount_point:
- lst.append((device, mount_point))
-
- return lst
-
-
-def export_zpools(root_mount_point):
- """ Exports the zpools if defined in global storage
-
- :param root_mount_point: The absolute path to the root of the install
- :return:
- """
- try:
- zfs_pool_list = libcalamares.globalstorage.value("zfsPoolInfo")
- zfs_pool_list.sort(reverse=True, key=lambda x: x["poolName"])
- if zfs_pool_list:
- for zfs_pool in zfs_pool_list:
- try:
- libcalamares.utils.host_env_process_output(['zpool', 'export', zfs_pool["poolName"]])
- except subprocess.CalledProcessError:
- libcalamares.utils.warning("Failed to export zpool")
- except Exception as e:
- # If this fails it shouldn't cause the installation to fail
- libcalamares.utils.warning("Received exception while exporting zpools: " + format(e))
- pass
-
-
-def run():
- """ Unmounts given mountpoints in decreasing order.
-
- :return:
- """
- root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
-
- if(libcalamares.job.configuration and
- "srcLog" in libcalamares.job.configuration and
- "destLog" in libcalamares.job.configuration):
- log_source = libcalamares.job.configuration["srcLog"]
- log_destination = libcalamares.job.configuration["destLog"]
- # Relocate log_destination into target system
- log_destination = '{!s}/{!s}'.format(root_mount_point, log_destination)
- # Make sure source is a string
- log_source = '{!s}'.format(log_source)
-
- # copy installation log before umount
- if os.path.exists(log_source):
- try:
- shutil.copy2(log_source, log_destination)
- except Exception as e:
- libcalamares.utils.warning("Could not preserve file {!s}, "
- "error {!s}".format(log_source, e))
-
- if not root_mount_point:
- return ("No mount point for root partition in globalstorage",
- "globalstorage does not contain a \"rootMountPoint\" key, "
- "doing nothing")
-
- if not os.path.exists(root_mount_point):
- return ("Bad mount point for root partition in globalstorage",
- "globalstorage[\"rootMountPoint\"] is \"{}\", which does not "
- "exist, doing nothing".format(root_mount_point))
-
- lst = list_mounts(root_mount_point)
- # Sort the list by mount point in decreasing order. This way we can be sure
- # we unmount deeper dirs first.
- lst.sort(key=lambda x: x[1], reverse=True)
-
- for device, mount_point in lst:
- # On success, no output; if the command fails, its output is
- # in the exception object.
- subprocess.check_output(["umount", "-lv", mount_point], stderr=subprocess.STDOUT)
-
- export_zpools(root_mount_point)
-
- os.rmdir(root_mount_point)
-
- return None
diff --git a/src/modules/umount/module.desc b/src/modules/umount/module.desc
deleted file mode 100644
index a1c189a62..000000000
--- a/src/modules/umount/module.desc
+++ /dev/null
@@ -1,7 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
----
-type: "job"
-name: "umount"
-interface: "python"
-script: "main.py"
diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf
index b6d86e353..9fb922740 100644
--- a/src/modules/umount/umount.conf
+++ b/src/modules/umount/umount.conf
@@ -4,22 +4,11 @@
### Umount Module
#
# This module represents the last part of the installation, the unmounting
-# of partitions used for the install. It is also the last place where it
-# is possible to copy files to the target system.
-#
-# The "copy log files" functionality is deprecated; use the *preservefiles*
-# module instead, which is more flexible.
-#
-# This module has two configuration keys:
-# srcLog location in the live system where the log is
-# destLog location in the target system to copy the log
+# of partitions used for the install. After this, there is no regular way
+# to modify the target system anymore.
#
---
-# example when using the normal Calamares log:
-srcLog: "/root/.cache/calamares/session.log"
-destLog: "/var/log/Calamares.log"
-
-# example when using a log created by `sudo calamares -d`:
-#srcLog: "/home/live/installation.log"
-#destLog: "/var/log/installation.log"
+# Setting emergency to true will make it so this module is still run
+# when a prior module fails
+emergency: false
diff --git a/src/modules/umount/umount.schema.yaml b/src/modules/umount/umount.schema.yaml
index 9b81db3d9..37771e5f6 100644
--- a/src/modules/umount/umount.schema.yaml
+++ b/src/modules/umount/umount.schema.yaml
@@ -6,5 +6,4 @@ $id: https://calamares.io/schemas/umount
additionalProperties: false
type: object
properties:
- srcLog: { type: string }
- destLog: { type: string }
+ emergency: { type: boolean }
diff --git a/src/modules/unpackfs/main.py b/src/modules/unpackfs/main.py
index 9f1bd822c..033073881 100644
--- a/src/modules/unpackfs/main.py
+++ b/src/modules/unpackfs/main.py
@@ -428,14 +428,16 @@ def run():
if not root_mount_point:
libcalamares.utils.warning("No mount point for root partition")
return (_("No mount point for root partition"),
- _("globalstorage does not contain a \"rootMountPoint\" key, "
- "doing nothing"))
-
+ _("globalstorage does not contain a \"rootMountPoint\" key."))
if not os.path.exists(root_mount_point):
libcalamares.utils.warning("Bad root mount point \"{}\"".format(root_mount_point))
return (_("Bad mount point for root partition"),
- _("rootMountPoint is \"{}\", which does not "
- "exist, doing nothing").format(root_mount_point))
+ _("rootMountPoint is \"{}\", which does not exist.".format(root_mount_point)))
+
+ if libcalamares.job.configuration.get("unpack", None) is None:
+ libcalamares.utils.warning("No *unpack* key in job configuration.")
+ return (_("Bad unpackfs configuration"),
+ _("There is no configuration information."))
supported_filesystems = get_supported_filesystems()
@@ -450,17 +452,17 @@ def run():
if sourcefs not in supported_filesystems:
libcalamares.utils.warning("The filesystem for \"{}\" ({}) is not supported by your current kernel".format(source, sourcefs))
libcalamares.utils.warning(" ... modprobe {} may solve the problem".format(sourcefs))
- return (_("Bad unsquash configuration"),
+ return (_("Bad unpackfs configuration"),
_("The filesystem for \"{}\" ({}) is not supported by your current kernel").format(source, sourcefs))
if not os.path.exists(source):
libcalamares.utils.warning("The source filesystem \"{}\" does not exist".format(source))
- return (_("Bad unsquash configuration"),
+ return (_("Bad unpackfs configuration"),
_("The source filesystem \"{}\" does not exist").format(source))
if sourcefs == "squashfs":
if shutil.which("unsquashfs") is None:
libcalamares.utils.warning("Failed to find unsquashfs")
- return (_("Bad unsquash configuration"),
+ return (_("Bad unpackfs configuration"),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed.") +
" " + _("Failed to unpack image \"{}\"").format(source))
@@ -475,7 +477,7 @@ def run():
if not os.path.isdir(destination) and sourcefs != "file":
libcalamares.utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination))
if is_first:
- return (_("Bad unsquash configuration"),
+ return (_("Bad unpackfs configuration"),
_("The destination \"{}\" in the target system is not a directory").format(destination))
else:
libcalamares.utils.debug(".. assuming that the previous targets will create that directory.")