[neon/neon/calamares-settings/Neon/unstable] /: switch mobile and bigscreen to be just normal install ISOs for now, not using oem-mode, since that is how the images are being used

[Jonathan Esk-Riddell]

Git commit cf120b2118a1cd647c625b4beb0224cd68f201fd by Jonathan Esk-Riddell.
Committed on 12/01/2023 at 13:04.
Pushed by jriddell into branch 'Neon/unstable'.

switch mobile and bigscreen to be just normal install ISOs for now, not using oem-mode, since that is how the images are being used

M  +9    -9    bigscreen/calamares/bigscreen/settings.conf
M  +70   -23   mobile/calamares/mobile/settings.conf

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

diff --git a/bigscreen/calamares/bigscreen/settings.conf b/bigscreen/calamares/bigscreen/settings.conf
index e8a86a5..a6a4064 100644
--- a/bigscreen/calamares/bigscreen/settings.conf
+++ b/bigscreen/calamares/bigscreen/settings.conf
@@ -1,5 +1,7 @@
-# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+# SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
 ---
 modules-search: [ local, /usr/share/calamares/modules ]
 
@@ -30,9 +32,6 @@ instances:
 - id: cryptsetup
   module: shellprocess
   config: shellprocess at cryptsetup.conf
-- id: plasma-bigscreen-sddm-config
-  config: plasma-bigscreen-sddm-config.conf
-  module: shellprocess
 
 sequence:
 
@@ -66,7 +65,6 @@ sequence:
     - contextualprocess at after_bootloader
     - shellprocess at nomodeset
     - shellprocess at install_translations
-    - shellprocess at plasma-bigscreen-sddm-config
     - packages
     - neon-fs-cleanup
     - shellprocess at logs
@@ -75,10 +73,12 @@ sequence:
   - show:
     - finished
 
+
 branding: neon
 prompt-install: false
-dont-chroot: true
-oem-setup: true
-disable-cancel: true
-disable-cancel-during-exec: true
+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 89edf79..a6a4064 100644
--- a/mobile/calamares/mobile/settings.conf
+++ b/mobile/calamares/mobile/settings.conf
@@ -1,37 +1,84 @@
-# SPDX-FileCopyrightText: 2022 Jonathan Esk-Riddell <jr at jriddell.org>
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr at jriddell.org>
+# SPDX-FileCopyrightText: 2016 Rohan Garg <rohan at kde.org>
 ---
-modules-search: [ local ]
+modules-search: [ local, /usr/share/calamares/modules ]
 
 instances:
-- id: plasma-mobile-sddm-config
-  config: plasma-mobile-sddm-config.conf
+- 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
 
 sequence:
+
   - show:
-      - welcome
-      - locale
-      - keyboard
-      - users
+    - welcome
+    - locale
+    - keyboard
+    - partition
+    - users
+
   - exec:
-      - machineid
-      - locale
-      - localecfg
-      - keyboard
-      - users
-      - networkcfg
-      - displaymanager
-      - shellprocess at plasma-mobile-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
+    - packages
+    - neon-fs-cleanup
+    - shellprocess at logs
+    - umount
+
   - show:
-      - finished
+    - finished
+
 
 branding: neon
 prompt-install: false
-dont-chroot: true
-oem-setup: true
-disable-cancel: true
-disable-cancel-during-exec: true
+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
-