OEM mode bugfixes

debian/changelog

@@ -1,3 +1,13 @@
+calamares-settings-ubuntu (1:24.04.16) noble; urgency=medium
+
+  * Actually fix the autologin bug.
+  * Don't kick the user out of first-run configuration mode if they don't
+    complete it the first time around.
+  * Fix a bug that caused the first-run setup wizard to not run even after
+    instructing it to.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Feb 2024 10:36:34 -0600
+
 calamares-settings-ubuntu (1:24.04.15) noble; urgency=medium
 
   * Add Lubuntu OEM config.

kubuntu/oem/calamares-finish-oem

@@ -12,7 +12,7 @@ if kdialog --warningyesno "${msg}"; then
   sddm_file="$(cat <<EOL
 [Autologin]
 Session=kubuntu-oem-environment
-echo 'User=oem
+User=oem
 EOL
 )"
   echo "$sddm_file" | sudo tee /etc/sddm.conf

kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env

@@ -2,7 +2,6 @@
 # Starts the Kubuntu OEM Environment.
 export QT_STYLE_OVERRIDE="Breeze"
 
-sudo rm /etc/sddm.conf # Ensure this session only runs on first bootup
 /usr/bin/kwin_x11 &
 /usr/bin/basicwallpaper /usr/share/wallpapers/Next/contents/3840x2160.png &
 sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.

kubuntu/oem/modules/displaymanager.conf

@@ -0,0 +1,9 @@
+displaymanagers:
+  - sddm
+
+defaultDesktopEnvironment:
+    executable: "startkde"
+    desktopFile: "plasma"
+
+basicSetup: false
+sysconfigSetup: false

kubuntu/oem/settings.conf

@@ -17,10 +17,11 @@ sequence:
   - locale
   - keyboard
   - localecfg
-  - packages
-  - shellprocess@oemfinish
   - users
+  - displaymanager
+  - packages
   - removeuser
+  - shellprocess@oemfinish
 - show:
   - finished
 

lubuntu/oem/calamares-finish-oem

@@ -12,7 +12,7 @@ if kdialog --warningyesno "${msg}"; then
   sddm_file="$(cat <<EOL
 [Autologin]
 Session=lubuntu-oem-environment
-echo 'User=oem
+User=oem
 EOL
 )"
   echo "$sddm_file" | sudo tee /etc/sddm.conf

lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env

@@ -10,7 +10,6 @@ export DESKTOP_SESSION="Lubuntu"
 export QT_STYLE_OVERRIDE="Breeze"
 export QT_QPA_PLATFORMTHEME="lxqt"
 
-sudo rm /etc/sddm.conf # make sure this session is only booted into once
 /usr/bin/openbox &
 /usr/bin/basicwallpaper /usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png &
 sudo -E /usr/bin/calamares -D8 # This is intentionally *not* backgrounded.

lubuntu/oem/modules/displaymanager.conf

@@ -0,0 +1,9 @@
+displaymanagers:
+  - sddm
+
+defaultDesktopEnvironment:
+    executable: "lxqt"
+    desktopFile: "Lubuntu"
+
+basicSetup: false
+sysconfigSetup: false

lubuntu/oem/settings.conf

@@ -17,10 +17,11 @@ sequence:
   - locale
   - keyboard
   - localecfg
-  - packages
-  - shellprocess@oemfinish
   - users
+  - displaymanager
+  - packages
   - removeuser
+  - shellprocess@oemfinish
 - show:
   - finished