From 0342f11d9bcffb0b313733f388b9a1b550ae6c7b Mon Sep 17 00:00:00 2001
From: Aaron Rainbolt <arraybolt3@ubuntu.com>
Date: Mon, 16 Mar 2026 12:39:03 -0400
Subject: [PATCH] Fix Lubuntu OEM first-time user setup

---
 debian/changelog                               |  7 +++++++
 lubuntu/modules/shellprocess_addcalamares.conf | 12 ++++++++++++
 lubuntu/oem/calamares-launch-oem               |  6 +++---
 lubuntu/settings.conf                          |  3 +++
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 lubuntu/modules/shellprocess_addcalamares.conf

diff --git a/debian/changelog b/debian/changelog
index 7723cbd..3b1fa96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calamares-settings-ubuntu (1:26.04.7) resolute; urgency=medium
+
+  * Add Calamares to the installed system when installing Lubuntu in OEM mode
+    (LP: #2127123)
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Mon, 16 Mar 2026 12:32:10 -0400
+
 calamares-settings-ubuntu (1:26.04.6) resolute; urgency=medium
 
   * Don't crash the installer if the software database update fails (LP:
diff --git a/lubuntu/modules/shellprocess_addcalamares.conf b/lubuntu/modules/shellprocess_addcalamares.conf
new file mode 100644
index 0000000..36f1527
--- /dev/null
+++ b/lubuntu/modules/shellprocess_addcalamares.conf
@@ -0,0 +1,12 @@
+# Only used during OEM installation, to add Calamares to the installed system
+# so that it can be used to provide first-time user setup.
+---
+dontChroot: false
+timeout: 120
+script:
+    - "mkdir /tmp/calamares-cdrom-sources"
+    - "cp /etc/apt/sources.list.d/cdrom.sources /tmp/calamares-cdrom-sources"
+    - "apt-get -o Dir::Etc::sourceparts=/tmp/calamares-cdrom-sources update"
+    - "apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict calamares"
+    - "rm /tmp/calamares-cdrom-sources/cdrom.sources"
+    - "rmdir /tmp/calamares-cdrom-sources"
diff --git a/lubuntu/oem/calamares-launch-oem b/lubuntu/oem/calamares-launch-oem
index 7eb1909..aee3d8c 100755
--- a/lubuntu/oem/calamares-launch-oem
+++ b/lubuntu/oem/calamares-launch-oem
@@ -22,9 +22,6 @@ if kdialog --warningyesno "${msg}"; then
   # Tweak branding to make it clear that OEM installation mode is active
   sudo cp /etc/calamares/branding/lubuntu/welcome-oem.png /etc/calamares/branding/lubuntu/welcome.png;
 
-  # Don't remove Calamares from the installed system.
-  sudo sed -i '/- calamares$/d' /etc/calamares/modules/packages.conf;
-
   # Enable oemid module, backslashes are needed for proper indentation
   sudo sed -i "/- welcome$/a \ \ - oemid" /etc/calamares/settings.conf;
 
@@ -34,6 +31,9 @@ if kdialog --warningyesno "${msg}"; then
   # Fix OEM UID
   sudo sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
 
+  # Add Calamares to the installed system
+  sudo sed -i "/- shellprocess@fix-oem-uid$/a \ \ - shellprocess@addcalamares" /etc/calamares/settings.conf;
+
   # Force the user of an OEM configuration user
   sudo cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
 
diff --git a/lubuntu/settings.conf b/lubuntu/settings.conf
index 4c4bf4e..e579a44 100644
--- a/lubuntu/settings.conf
+++ b/lubuntu/settings.conf
@@ -38,6 +38,9 @@ instances:
 - id: rmcdrom
   module: shellprocess
   config: shellprocess_rmcdrom.conf
+- id: addcalamares
+  module: shellprocess
+  config: shellprocess_addcalamares.conf
 
 sequence:
 - show: