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)

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.664.36) UNRELEASED; 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 <michael.hudson@ubuntu.com>  Thu, 25 Nov 2021 10:31:53 +1300
+
 livecd-rootfs (2.664.35) focal; urgency=medium
 
   [ Thomas Bechtold ]

live-build/ubuntu-server/hooks/032-installer-squashfs.binary

@@ -83,11 +83,13 @@ sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
 
 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"