Fix an issue where the user made during post-OEM user setup would be given UID 1001.

common/modules/shellprocess_fix_oem_uid.conf

@@ -0,0 +1,7 @@
+---
+dontChroot: false
+timeout: 120
+script:
+    - "sed -i 's/oem:x:1000:1000/oem:x:60999:60999/' /etc/passwd"
+    - "sed -i 's/oem:x:1000/oem:x:60999/' /etc/group"
+    - "chown -R 60999:60999 /home/oem"

debian/changelog

@@ -6,6 +6,14 @@ calamares-settings-ubuntu (1:24.10.2) UNRELEASED; urgency=medium
     first-time user setup after an OEM installation
   * ubuntuunity: Do not recommend that the user have an Internet connection
     during first-time user setup after an OEM installation
+  * all: Change the UID of the OEM configuration user to 60999.
+    - This is done because otherwise the OEM configuration user is given UID
+      1000. This results in the first real user on the machine having UID
+      1001, which could cause issues in a single-user deployment where the
+      user must have or is assumed to have UID 1000. Setting the OEM
+      configuration user's UID to 60999 results in the first real user having
+      UID 1000. This is similar (though not identical) to Ubiquity's behavior
+      with the OEM configuration user.
 
  -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 12 Jun 2024 23:26:13 -0500
 

kubuntu/oem/calamares-launch-oem

@@ -31,6 +31,9 @@ if kdialog --warningyesno "${msg}"; then
   # Enable OEM prep module
   sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
 
+  # Fix OEM UID
+  sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
+
   # Force the user of an OEM configuration user
   cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
 

kubuntu/settings.conf

@@ -32,6 +32,9 @@ instances:
 - id: fixconkeys_part2
   module: shellprocess
   config: shellprocess_fixconkeys_part2.conf
+- id: fix-oem-uid
+  module: shellprocess
+  config: shellprocess_fix_oem_uid.conf
 
 sequence:
 - show:

lubuntu/oem/calamares-launch-oem

@@ -31,6 +31,9 @@ if kdialog --warningyesno "${msg}"; then
   # Enable OEM prep module
   sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
 
+  # Fix OEM UID
+  sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
+
   # Force the user of an OEM configuration user
   cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
 

lubuntu/settings.conf

@@ -32,6 +32,9 @@ instances:
 - id: fixconkeys_part2
   module: shellprocess
   config: shellprocess_fixconkeys_part2.conf
+- id: fix-oem-uid
+  module: shellprocess
+  config: shellprocess_fix_oem_uid.conf
 
 sequence:
 - show:

ubuntuunity/oem/calamares-launch-oem

@@ -28,6 +28,9 @@ if zenity --question --text="${msg}"; then
   # Enable OEM prep module
   sed -i "/- packages$/a \ \ - shellprocess@oemprep" /etc/calamares/settings.conf;
 
+  # Fix OEM UID
+  sed -i "/- shellprocess@oemprep$/a \ \ - shellprocess@fix-oem-uid" /etc/calamares/settings.conf;
+
   # Force the user of an OEM configuration user
   cp /etc/calamares/modules/users.conf.oem /etc/calamares/modules/users.conf;
 

ubuntuunity/settings.conf

@@ -32,6 +32,9 @@ instances:
 - id: fixconkeys_part2
   module: shellprocess
   config: shellprocess_fixconkeys_part2.conf
+- id: fix-oem-uid
+  module: shellprocess
+  config: shellprocess_fix_oem_uid.conf
 
 sequence:
 - show: