Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-01 13:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

live-server: remove duplicate snaps, due to overlayfs vs snap-preseed.

Browse Source 
(cherry picked from commit 6e6ab16bf268c038392e9f4aa7b8398a53af65d5)
This commit is contained in:
Dimitri John Ledkov 2020-07-17 18:57:46 +01:00
parent 39ebdf6902
commit 56a7169ebe
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,9 @@ if [ -n "$SUBARCH" ]; then
exit 0 exit 0
fi fi
. config/binary
. config/functions . config/functions
. config/common . config/common
# somehow i don't have LB_DISTRIBUTION set ?!
. config/bootstrap
FILESYSTEM_ROOT=binary/boot/squashfs.dir FILESYSTEM_ROOT=binary/boot/squashfs.dir
INSTALLER_ROOT=binary/boot/installer.squashfs.dir INSTALLER_ROOT=binary/boot/installer.squashfs.dir
@ -84,6 +83,12 @@ 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
# 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
squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs" squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
(cd "$OVERLAY_ROOT/" && (cd "$OVERLAY_ROOT/" &&