Imported 2.755

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2022-02-11 03:59:14 +00:00
parent 27eae37284
commit f4bc08a89d
3 changed files with 17 additions and 3 deletions

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
livecd-rootfs (2.755) jammy; urgency=medium
[ Brian Murray ]
* Add the casper package instead of the lupin-casper package as the
installer for Windows is a project that is no longer supported and lupin
is being removed the archive in LP: 1960457.
[ John Chittum ]
* Add sleep due to e2fsck error in umount_partition. LP: #1960537
-- Brian Murray <brian@ubuntu.com> Thu, 10 Feb 2022 13:54:42 -0800
livecd-rootfs (2.754) jammy; urgency=medium livecd-rootfs (2.754) jammy; urgency=medium
* Disable APT periodic update for OCI/docker images when cron-like * Disable APT periodic update for OCI/docker images when cron-like

View File

@ -548,11 +548,11 @@ case $IMAGEFORMAT in
;; ;;
ubuntu) ubuntu)
if [ "$SUBPROJECT" != "canary" ]; then if [ "$SUBPROJECT" != "canary" ]; then
add_package live lupin-casper add_package live casper
fi fi
;; ;;
*) *)
add_package live lupin-casper add_package live casper
;; ;;
esac esac
;; ;;
@ -840,7 +840,7 @@ case $PROJECT in
snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server-minimal.ubuntu-server.full snap_from_seed server config/package-lists/livecd-rootfs.snaplist.chroot_ubuntu-server-minimal.ubuntu-server.full
add_package ubuntu-server-minimal.ubuntu-server cloud-init add_package ubuntu-server-minimal.ubuntu-server cloud-init
add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware lupin-casper openssh-server add_package ubuntu-server-minimal.ubuntu-server.installer linux-firmware casper openssh-server
add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic add_snap ubuntu-server-minimal.ubuntu-server.installer subiquity/classic
if [ $ARCH = s390x ]; then if [ $ARCH = s390x ]; then
add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey

View File

@ -234,6 +234,8 @@ umount_partition() {
mount --make-private $mountpoint mount --make-private $mountpoint
umount $mountpoint umount $mountpoint
udevadm settle udevadm settle
# workaround for LP: 1960537
sleep 30
if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then
# buildd's don't have /etc/mtab symlinked # buildd's don't have /etc/mtab symlinked