From 2e551c98e4bd1601c9bf8817e0fe499babd2ab3d Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@gmail.com>
Date: Thu, 15 Feb 2024 13:30:35 -0600
Subject: [PATCH] OEM mode bugfixes

---
 debian/changelog                                  | 10 ++++++++++
 kubuntu/oem/calamares-finish-oem                  |  2 +-
 kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env |  1 -
 kubuntu/oem/modules/displaymanager.conf           |  9 +++++++++
 kubuntu/oem/settings.conf                         |  5 +++--
 lubuntu/oem/calamares-finish-oem                  |  2 +-
 lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env |  1 -
 lubuntu/oem/modules/displaymanager.conf           |  9 +++++++++
 lubuntu/oem/settings.conf                         |  5 +++--
 9 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 kubuntu/oem/modules/displaymanager.conf
 create mode 100644 lubuntu/oem/modules/displaymanager.conf

diff --git a/debian/changelog b/debian/changelog
index 0fac38e..0b9c166 100644
--- a/debian/changelog
+++ b/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.
diff --git a/kubuntu/oem/calamares-finish-oem b/kubuntu/oem/calamares-finish-oem
index f8140e7..3366f62 100755
--- a/kubuntu/oem/calamares-finish-oem
+++ b/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
diff --git a/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env b/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
index e195dc7..16aab3a 100755
--- a/kubuntu/oem/kubuntu-oem-env/start-kubuntu-oem-env
+++ b/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.
diff --git a/kubuntu/oem/modules/displaymanager.conf b/kubuntu/oem/modules/displaymanager.conf
new file mode 100644
index 0000000..4754fa0
--- /dev/null
+++ b/kubuntu/oem/modules/displaymanager.conf
@@ -0,0 +1,9 @@
+displaymanagers:
+  - sddm
+
+defaultDesktopEnvironment:
+    executable: "startkde"
+    desktopFile: "plasma"
+
+basicSetup: false
+sysconfigSetup: false
diff --git a/kubuntu/oem/settings.conf b/kubuntu/oem/settings.conf
index d42a707..7c36306 100644
--- a/kubuntu/oem/settings.conf
+++ b/kubuntu/oem/settings.conf
@@ -17,10 +17,11 @@ sequence:
   - locale
   - keyboard
   - localecfg
-  - packages
-  - shellprocess@oemfinish
   - users
+  - displaymanager
+  - packages
   - removeuser
+  - shellprocess@oemfinish
 - show:
   - finished
 
diff --git a/lubuntu/oem/calamares-finish-oem b/lubuntu/oem/calamares-finish-oem
index 5827b62..911a101 100755
--- a/lubuntu/oem/calamares-finish-oem
+++ b/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
diff --git a/lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env b/lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env
index e3b3d77..feed2c6 100755
--- a/lubuntu/oem/lubuntu-oem-env/start-lubuntu-oem-env
+++ b/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.
diff --git a/lubuntu/oem/modules/displaymanager.conf b/lubuntu/oem/modules/displaymanager.conf
new file mode 100644
index 0000000..9a85b79
--- /dev/null
+++ b/lubuntu/oem/modules/displaymanager.conf
@@ -0,0 +1,9 @@
+displaymanagers:
+  - sddm
+
+defaultDesktopEnvironment:
+    executable: "lxqt"
+    desktopFile: "Lubuntu"
+
+basicSetup: false
+sysconfigSetup: false
diff --git a/lubuntu/oem/settings.conf b/lubuntu/oem/settings.conf
index c0e0cc8..edd4c5e 100644
--- a/lubuntu/oem/settings.conf
+++ b/lubuntu/oem/settings.conf
@@ -17,10 +17,11 @@ sequence:
   - locale
   - keyboard
   - localecfg
-  - packages
-  - shellprocess@oemfinish
   - users
+  - displaymanager
+  - packages
   - removeuser
+  - shellprocess@oemfinish
 - show:
   - finished