diff -Nru livecd-rootfs-2.664.35/debian/changelog livecd-rootfs-2.664.36/debian/changelog --- livecd-rootfs-2.664.35/debian/changelog 2021-11-18 23:42:45.000000000 +0000 +++ livecd-rootfs-2.664.36/debian/changelog 2021-12-01 23:05:00.000000000 +0000 @@ -1,3 +1,11 @@ +livecd-rootfs (2.664.36) focal; urgency=medium + + * live-build/ubuntu-server/hooks/032-installer-squashfs.binary: be more + careful in deleting snaps that snap-preseed has copied up into the live + installer layer. (LP: #1952093) + + -- Michael Hudson-Doyle Thu, 02 Dec 2021 12:05:00 +1300 + livecd-rootfs (2.664.35) focal; urgency=medium [ Thomas Bechtold ] diff -Nru livecd-rootfs-2.664.35/live-build/ubuntu-server/hooks/032-installer-squashfs.binary livecd-rootfs-2.664.36/live-build/ubuntu-server/hooks/032-installer-squashfs.binary --- livecd-rootfs-2.664.35/live-build/ubuntu-server/hooks/032-installer-squashfs.binary 2021-11-18 23:40:57.000000000 +0000 +++ livecd-rootfs-2.664.36/live-build/ubuntu-server/hooks/032-installer-squashfs.binary 2021-12-01 23:04:53.000000000 +0000 @@ -83,11 +83,13 @@ teardown_mountpoint "$INSTALLER_ROOT" -# Drop core/lxd/snapd that got copied up from base layer, due to -# snap-preseed tool doing --reset & speedup -find $OVERLAY_ROOT/var/lib/snapd/ -name 'core*.snap' -delete -find $OVERLAY_ROOT/var/lib/snapd/ -name 'snapd_*.snap' -delete -find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete +# Drop snaps that got copied up from base layer, due to snap-preseed +# tool doing --reset & speedup +for snap in $(cd $OVERLAY_ROOT; find var/lib/snapd/ -name '*.snap'); do + if [ -f $FILESYSTEM_ROOT/$snap ]; then + rm $OVERLAY_ROOT/$snap; + fi +done squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"