[neon/neon/livecd-rootfs/Neon/release] /: 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]

Git commit f27474810185ad85e2bd4f445151d1c1cc5661f4 by Michael Hudson-Doyle.
Committed on 25/11/2021 at 00:28.
Pushed by jriddell into branch 'Neon/release'.

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)

M  +8    -0    debian/changelog
M  +7    -5    live-build/ubuntu-server/hooks/032-installer-squashfs.binary

https://invent.kde.org/neon/neon/livecd-rootfs/commit/f27474810185ad85e2bd4f445151d1c1cc5661f4

diff --git a/debian/changelog b/debian/changelog
index 7e0552aa..280501f7 100644
--- a/debian/changelog
+++ b/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 at ubuntu.com>  Thu, 25 Nov 2021 10:31:53 +1300
+
 livecd-rootfs (2.664.35) focal; urgency=medium
 
   [ Thomas Bechtold ]
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index c12c8bf1..1bddfe87 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/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"