Imported 2.828

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-04-14 19:48:09 +00:00
parent f04ea0b620
commit ff19cfa555
2 changed files with 7 additions and 5 deletions

7
debian/changelog vendored
View File

@ -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 <dave.jones@canonical.com> 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

View File

@ -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" \