From ff19cfa55536b66b28fc538964d51f1fd0580e23 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 14 Apr 2023 19:48:09 +0000 Subject: [PATCH] Imported 2.828 No reason for CPC update specified. --- debian/changelog | 7 +++++++ .../ubuntu/hooks/099-ubuntu-image-customization.chroot | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index c892ee70..f48a7b4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.828) lunar; urgency=medium + + * 099-ubuntu-image-customization.chroot: Remove redundant creation of oem + user and oem-config-prepare (LP: #2016285) + + -- Dave Jones Fri, 14 Apr 2023 09:48:31 +0100 + livecd-rootfs (2.827) lunar; urgency=medium * Fix netboot tarball generation code to properly handle the recent change diff --git a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot index 91449b61..82005f42 100644 --- a/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot +++ b/live-build/ubuntu/hooks/099-ubuntu-image-customization.chroot @@ -18,11 +18,6 @@ if [ "$IMAGEFORMAT" == "none" ]; then touch "/var/lib/oem-config/run" fi - /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" - # Update the fstab to include the "discard" option awk \ -v root_fs_label="writable" \