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

Make snapd-explicit-install-stamp a part of the image

Browse Source
This commit is contained in:
Tobias Koch 2019-04-12 17:03:31 +02:00 committed by Steve Langasek
parent 796211dde7
commit 79e3123053
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
live-build/functions
View File

@ -429,6 +429,7 @@ _snap_post_process() {
local snaps_dir="$seed_dir/snaps" local snaps_dir="$seed_dir/snaps"
local seed_yaml="$seed_dir/seed.yaml" local seed_yaml="$seed_dir/seed.yaml"
local assertions_dir="$seed_dir/assertions" local assertions_dir="$seed_dir/assertions"
local snapd_install_stamp="$seed_dir/.snapd-explicit-install-stamp"
case $SNAP_NAME in case $SNAP_NAME in
core[0-9]*) core[0-9]*)
@ -442,7 +443,7 @@ _snap_post_process() {
# If the snapd snap has been seeded, but not marked as explicitly # If the snapd snap has been seeded, but not marked as explicitly
# installed (see snap_preseed below), then remove it. # installed (see snap_preseed below), then remove it.
if [ -f ${snaps_dir}/snapd_[0-9]*.snap ] && \ if [ -f ${snaps_dir}/snapd_[0-9]*.snap ] && \
[ ! -f config/snapd-explicit-install-stamp ] [ ! -f "$snapd_install_stamp" ]
then then
# Remove snap, assertions and entry in seed.yaml # Remove snap, assertions and entry in seed.yaml
rm -f ${snaps_dir}/snapd_[0-9]*.snap rm -f ${snaps_dir}/snapd_[0-9]*.snap
@ -628,9 +629,10 @@ snap_preseed() {
_snap_preseed $CHROOT_ROOT $SNAP $CHANNEL _snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
# Mark this image as having snapd installed explicitly.
case $SNAP_NAME in case $SNAP_NAME in
snapd) snapd)
touch config/snapd-explicit-install-stamp touch "$CHROOT_ROOT/var/lib/snapd/seed/.snapd-explicit-install-stamp"
;; ;;
esac esac
} }