Merge ~jawn-smith/ubuntu/+source/livecd-rootfs:oem-user-check into ubuntu/+source/livecd-rootfs:ubuntu/devel

[William Wilson]

We are making efforts to move some of the livecd-rootfs hook logic to packages such as ubuntu-settings. I have staged a change to ubuntu-settings to set up the oem-config user as a postinst for ubuntu-raspi-settings-desktop. I want to avoid an issue where both livecd-rootfs and ubuntu-raspi-settings desktop both try to do this setup, so have added some logic here to only run the oem-config setup steps if the oem user does not already exist.

[Dave Jones (waveform)]

Looks reasonable to me in the context of the proposed ubuntu-raspi-settings-desktop changes [1]. We *could* remove the lines under the assumption that the postinst will take care of them but that potentially breaks other pre-installed desktop images (I'm not sure there are any official ones yet, but there might be so this is the safer option).

Also, better to stick hacks like this in the pile-of-hacks-known-as-livecd-rootfs than anywhere else under the assumption that many of them will disappear in a puff of ubuntu-image-flavoured-smoke in the coming cycle.

[1]: https://dpaste.com/CX2JGNYGK

review: Approve

[Łukasz Zemczak (sil2100)]

Looking good!

review: Approve

[Łukasz Zemczak (sil2100)]

Actually, wrong MP target! We have a dedicated livecd-rootfs repo: https://code.launchpad.net/livecd-rootfs

Unmerged commits

bfc687e... by William Wilson on 2023-03-27

Skip oem-config setup if oem user already exists

diff --git a/debian/changelog b/debian/changelog
index 12c47d1..3dab9fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.817) lunar; urgency=medium
+
+  * Skip oem-config setup in hooks if the oem user already exists.
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Mon, 27 Mar 2023 09:30:08 -0400
+
 livecd-rootfs (2.816) lunar; urgency=medium
 
   [ Chad Smith ]
diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
index 6dd49d8..cc3814e 100644
--- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
+++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot
@@ -11,11 +11,12 @@ if [ "$IMAGEFORMAT" == "none" ]; then
         touch /var/log/syslog
         chown syslog:adm /var/log/syslog
 
-        # Create the oem user account
-        /usr/sbin/useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem
-
-        /usr/sbin/oem-config-prepare --quiet
-        touch "/var/lib/oem-config/run"
+        # Create the oem user account only if it doesn't already exist
+        if ! id "oem" &>/dev/null; then
+                /usr/sbin/useradd -d /home/oem -G adm,sudo -m -N -u 29999 oem
+                /usr/sbin/oem-config-prepare --quiet
+                touch "/var/lib/oem-config/run"
+        fi
 
         # Update the fstab to include the "discard" option, and
         # "x-systemd.growfs" to ensure the root partition is expanded on first