Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Hudson-Doyle 2021-06-24 10:29:54 +12:00
parent cac00a68aa
commit 9a983305ee
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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

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

@ -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"