[neon/neon/calamares-settings/Neon/unstable] /: add missing variables for desktop settings.conf and sync bigscreen to desktop settings

[Jonathan Esk-Riddell]

Git commit 6536f38811d975d52976e27247b8a4a9662f2b21 by Jonathan Esk-Riddell.
Committed on 17/11/2022 at 16:12.
Pushed by jriddell into branch 'Neon/unstable'.

add missing variables for desktop settings.conf and sync bigscreen to desktop settings

M  +64   -15   bigscreen/calamares/bigscreen/settings.conf
M  +6    -0    desktop/calamares/desktop/settings.conf
M  +2    -0    mobile/calamares/mobile/settings.conf

https://invent.kde.org/neon/neon/calamares-settings/commit/6536f38811d975d52976e27247b8a4a9662f2b21

diff --git a/bigscreen/calamares/bigscreen/settings.conf b/bigscreen/calamares/bigscreen/settings.conf
index f5fe780..e8a86a5 100644
--- a/bigscreen/calamares/bigscreen/settings.conf
+++ b/bigscreen/calamares/bigscreen/settings.conf
@@ -1,31 +1,79 @@
 # SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 ---
-modules-search: [ local ]
+modules-search: [ local, /usr/share/calamares/modules ]
 
 instances:
+- id:       install_translations
+  module:   shellprocess
+  config:   shellprocess_install_translations.conf
+- id:       before_bootloader
+  module:   contextualprocess
+  config:   before_bootloader_context.conf
+- id:       after_bootloader
+  module:   contextualprocess
+  config:   after_bootloader_context.conf
+- id: logs
+  module: shellprocess
+  config: shellprocess_logs.conf
+- id: boot_deploy
+  module: shellprocess
+  config: shellprocess at boot_deploy.conf
+- id: boot_reconfigure
+  module: shellprocess
+  config: shellprocess at boot_reconfigure.conf
+# NB: nomodeset is not forwared for OEM mode. An OEM shouldn't use this
+#   kind of hack for OEM installations!
+- id: nomodeset
+  module: shellprocess
+  config: shellprocess at nomodeset.conf
+- id: cryptsetup
+  module: shellprocess
+  config: shellprocess at cryptsetup.conf
 - id: plasma-bigscreen-sddm-config
   config: plasma-bigscreen-sddm-config.conf
   module: shellprocess
 
 sequence:
+
   - show:
-      - welcome
-      - locale
-      - keyboard
-      - users
+    - welcome
+    - locale
+    - keyboard
+    - partition
+    - users
+
   - exec:
-      - machineid
-      - locale
-      - localecfg
-      - keyboard
-      - users
-      - networkcfg
-      - displaymanager
-      - shellprocess at plasma-bigscreen-sddm-config
-      - packages at pkg
+    - partition
+    - mount
+    - unpackfs
+    - machineid
+    - fstab
+    - locale
+    - keyboard
+    - localecfg
+    - luksbootkeyfile
+    - users
+    - displaymanager
+    - networkcfg
+    - hwclock
+    - shellprocess at boot_deploy
+    - shellprocess at boot_reconfigure
+    - shellprocess at cryptsetup
+    - initramfs
+    - contextualprocess at before_bootloader
+    - bootloader
+    - contextualprocess at after_bootloader
+    - shellprocess at nomodeset
+    - shellprocess at install_translations
+    - shellprocess at plasma-bigscreen-sddm-config
+    - packages
+    - neon-fs-cleanup
+    - shellprocess at logs
+    - umount
+
   - show:
-      - finished
+    - finished
 
 branding: neon
 prompt-install: false
@@ -33,3 +81,4 @@ dont-chroot: true
 oem-setup: true
 disable-cancel: true
 disable-cancel-during-exec: true
+quit-at-end: false
diff --git a/desktop/calamares/desktop/settings.conf b/desktop/calamares/desktop/settings.conf
index d80c69b..a6a4064 100644
--- a/desktop/calamares/desktop/settings.conf
+++ b/desktop/calamares/desktop/settings.conf
@@ -76,3 +76,9 @@ sequence:
 
 branding: neon
 prompt-install: false
+dont-chroot: false
+oem-setup: false
+disable-cancel: false
+disable-cancel-during-exec: false
+hide-back-and-next-during-exec: false
+quit-at-end: false
diff --git a/mobile/calamares/mobile/settings.conf b/mobile/calamares/mobile/settings.conf
index 190c67a..89edf79 100644
--- a/mobile/calamares/mobile/settings.conf
+++ b/mobile/calamares/mobile/settings.conf
@@ -33,3 +33,5 @@ dont-chroot: true
 oem-setup: true
 disable-cancel: true
 disable-cancel-during-exec: true
+quit-at-end: false
+