Remove assumption in 032-installer-squashfs.binary that all core snaps needed for subiquity are already in the filesystem layer. (LP: #1933352)

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.727) UNRELEASED; urgency=medium
+
+  * Remove assumption in 032-installer-squashfs.binary that all core snaps
+    needed for subiquity are already in the filesystem layer. (LP: #1933352)
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 24 Jun 2021 10:29:05 +1200
+
 livecd-rootfs (2.726) impish; urgency=medium
 
   * Fix overriding of ExecStart in

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

@@ -83,11 +83,14 @@ 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
+# Drop any snaps 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
+for snap in $(cd $OVERLAY_ROOT/; find var/lib/snapd/ -name '*.snap'); do
+    if [ -f $FILESYSTEM_ROOT/$snap ]; then
+        echo "removing $snap from overlay as already present in base layer"
+        rm $OVERLAY_ROOT/$snap
+    fi
+done
 
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"