diff --git a/debian/changelog b/debian/changelog index cff499f8..0320c59a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 10 Feb 2022 13:54:42 -0800 + livecd-rootfs (2.754) jammy; urgency=medium * Disable APT periodic update for OCI/docker images when cron-like diff --git a/live-build/auto/config b/live-build/auto/config index 0d3c1b9d..2e4ad395 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -548,11 +548,11 @@ case $IMAGEFORMAT in ;; ubuntu) if [ "$SUBPROJECT" != "canary" ]; then - add_package live lupin-casper + add_package live casper fi ;; *) - add_package live lupin-casper + add_package live casper ;; 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 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 if [ $ARCH = s390x ]; then add_package ubuntu-server-minimal.ubuntu-server.installer s390-tools-zkey diff --git a/live-build/functions b/live-build/functions index 85c3a50f..3d01b0e3 100644 --- a/live-build/functions +++ b/live-build/functions @@ -234,6 +234,8 @@ umount_partition() { mount --make-private $mountpoint umount $mountpoint udevadm settle + # workaround for LP: 1960537 + sleep 30 if [ -n "${rootfs_dev_mapper}" -a -b "${rootfs_dev_mapper}" ]; then # buildd's don't have /etc/mtab symlinked