Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 17:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-11-25 10:32:52 +13:00
parent 2b933a24fa
commit f274748101
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.664.35) focal; urgency=medium
[ Thomas Bechtold ] [ Thomas Bechtold ]

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

@ -83,11 +83,13 @@ sed -i -e'N;/name: lxd/,+2d' $INSTALLER_ROOT/var/lib/snapd/seed/seed.yaml
teardown_mountpoint "$INSTALLER_ROOT" teardown_mountpoint "$INSTALLER_ROOT"
# Drop core/lxd/snapd that got copied up from base layer, due to # Drop snaps that got copied up from base layer, due to snap-preseed
# snap-preseed tool doing --reset & speedup # tool doing --reset & speedup
find $OVERLAY_ROOT/var/lib/snapd/ -name 'core*.snap' -delete for snap in $(cd $OVERLAY_ROOT; find var/lib/snapd/ -name '*.snap'); do
find $OVERLAY_ROOT/var/lib/snapd/ -name 'snapd_*.snap' -delete if [ -f $FILESYSTEM_ROOT/$snap ]; then
find $OVERLAY_ROOT/var/lib/snapd/ -name 'lxd_*.snap' -delete rm $OVERLAY_ROOT/$snap;
fi
done
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"