[neon/neon/calamares-settings/Neon/release_jammy] /: tidy up grubcfg usage and stray shellprocess at cryptsetup remnant

Carlos De Maine null at kde.org
Sat Aug 31 23:16:30 BST 2024


Git commit 530b7eb527b3f5ecb0c4fe247bb2b7c8832ca873 by Carlos De Maine.
Committed on 31/08/2024 at 22:16.
Pushed by carlosdem into branch 'Neon/release_jammy'.

tidy up grubcfg usage and stray shellprocess at cryptsetup remnant

(cherry picked from commit aa5454fc30532daadefedb3c88991ebb0d214c15)

M  +1    -1    bigscreen/calamares/bigscreen/settings.conf
M  +1    -0    mobile/calamares/mobile/settings.conf
M  +1    -0    oem-prepare/calamares/oem-prepare/settings.conf

https://invent.kde.org/neon/neon/calamares-settings/-/commit/530b7eb527b3f5ecb0c4fe247bb2b7c8832ca873

diff --git a/bigscreen/calamares/bigscreen/settings.conf b/bigscreen/calamares/bigscreen/settings.conf
index ca38e54..c656258 100644
--- a/bigscreen/calamares/bigscreen/settings.conf
+++ b/bigscreen/calamares/bigscreen/settings.conf
@@ -57,10 +57,10 @@ sequence:
     - hwclock
     - shellprocess at boot_deploy
     - shellprocess at boot_reconfigure
-    - shellprocess at cryptsetup
     - initramfscfg
     - initramfs
     - fstab
+    - grubcfg
     - contextualprocess at before_bootloader
     - bootloader
     - contextualprocess at after_bootloader
diff --git a/mobile/calamares/mobile/settings.conf b/mobile/calamares/mobile/settings.conf
index 100d1dd..636adc8 100644
--- a/mobile/calamares/mobile/settings.conf
+++ b/mobile/calamares/mobile/settings.conf
@@ -60,6 +60,7 @@ sequence:
     - initramfscfg
     - initramfs
     - fstab
+    - grubcfg
     - contextualprocess at before_bootloader
     - bootloader
     - contextualprocess at after_bootloader
diff --git a/oem-prepare/calamares/oem-prepare/settings.conf b/oem-prepare/calamares/oem-prepare/settings.conf
index 654e610..4e3f2ab 100644
--- a/oem-prepare/calamares/oem-prepare/settings.conf
+++ b/oem-prepare/calamares/oem-prepare/settings.conf
@@ -65,6 +65,7 @@ sequence:
     - contextualprocess at oem-kernel
     - initramfs
     - fstab
+    - grubcfg
     - contextualprocess at before_bootloader
     - bootloader
     - contextualprocess at after_bootloader


More information about the Neon-commits mailing list