diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary index 99dab98c..a86deb35 100755 --- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary +++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary @@ -21,10 +21,9 @@ if [ -n "$SUBARCH" ]; then exit 0 fi +. config/binary . config/functions . config/common -# somehow i don't have LB_DISTRIBUTION set ?! -. config/bootstrap FILESYSTEM_ROOT=binary/boot/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" +# 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" create_squashfs "$OVERLAY_ROOT/" ${squashfs_f}