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

Make snap functions idempotent

Browse Source 
_snap_preseed and snap_prepare_assertions can be called several times
with the same snap and will only provision it once.
This commit is contained in:
Jean-Baptiste Lallement 2018-11-15 12:08:07 +01:00
parent ef72cf5fe8
commit 00e474e2ff
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
live-build/functions
View File

@ -411,6 +411,12 @@ _snap_preseed() {
# Download the snap & assertion # Download the snap & assertion
local snap_download_failed=0 local snap_download_failed=0
# Preseed a snap only once
if [ -f ${snaps_dir}/${SNAP_NAME}_[0-9]*.snap ]; then
return
fi
chroot $CHROOT_ROOT sh -c " chroot $CHROOT_ROOT sh -c "
set -x; set -x;
cd /var/lib/snapd/seed; cd /var/lib/snapd/seed;
@ -456,6 +462,10 @@ snap_prepare_assertions() {
local account_key_assertion="$assertions_dir/account-key" local account_key_assertion="$assertions_dir/account-key"
local account_assertion="$assertions_dir/account" local account_assertion="$assertions_dir/account"
if [ -d "$assertions_dir" ]; then
return
fi
mkdir -p "$assertions_dir" mkdir -p "$assertions_dir"
mkdir -p "$snaps_dir" mkdir -p "$snaps_dir"
@ -500,15 +510,10 @@ snap_prepare() {
# used for the image's model assertion # used for the image's model assertion
local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic} local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
local snaps_dir="$seed_dir/snaps"
snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL" snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
# Download the core snap # Download the core snap
if ! [ -f $snaps_dir/core_[0-9]*.snap ] ; then _snap_preseed $CHROOT_ROOT core stable
_snap_preseed $CHROOT_ROOT core stable
fi
} }
snap_preseed() { snap_preseed() {