|
|
|
@ -416,6 +416,47 @@ inheritance () {
|
|
|
|
echo "$inherit"
|
|
|
|
echo "$inherit"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
_snap_post_process() {
|
|
|
|
|
|
|
|
# Look for the 'core' snap. If it is not present, assume that the image
|
|
|
|
|
|
|
|
# contains only snaps with bases >= core18. In that case snapd is
|
|
|
|
|
|
|
|
# preseeded. However, when 'core' is being installed and snapd has not
|
|
|
|
|
|
|
|
# been installed by a call to 'snap_preseed' (see below) then it is
|
|
|
|
|
|
|
|
# removed again.
|
|
|
|
|
|
|
|
local CHROOT_ROOT=$1
|
|
|
|
|
|
|
|
local SNAP_NAME=$2
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local seed_dir="$CHROOT_ROOT/var/lib/snapd/seed"
|
|
|
|
|
|
|
|
local snaps_dir="$seed_dir/snaps"
|
|
|
|
|
|
|
|
local seed_yaml="$seed_dir/seed.yaml"
|
|
|
|
|
|
|
|
local assertions_dir="$seed_dir/assertions"
|
|
|
|
|
|
|
|
local snapd_install_stamp="$seed_dir/.snapd-explicit-install-stamp"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case $SNAP_NAME in
|
|
|
|
|
|
|
|
core[0-9]*)
|
|
|
|
|
|
|
|
# If the 'core' snap is not present, assume we are coreXX-only and
|
|
|
|
|
|
|
|
# install the snapd snap.
|
|
|
|
|
|
|
|
if [ ! -f ${snaps_dir}/core_[0-9]*.snap ]; then
|
|
|
|
|
|
|
|
_snap_preseed $CHROOT_ROOT snapd stable
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
core)
|
|
|
|
|
|
|
|
# If the snapd snap has been seeded, but not marked as explicitly
|
|
|
|
|
|
|
|
# installed (see snap_preseed below), then remove it.
|
|
|
|
|
|
|
|
if [ -f ${snaps_dir}/snapd_[0-9]*.snap ] && \
|
|
|
|
|
|
|
|
[ ! -f "$snapd_install_stamp" ]
|
|
|
|
|
|
|
|
then
|
|
|
|
|
|
|
|
# Remove snap, assertions and entry in seed.yaml
|
|
|
|
|
|
|
|
rm -f ${snaps_dir}/snapd_[0-9]*.snap
|
|
|
|
|
|
|
|
rm -f ${assertions_dir}/snapd_[0-9]*.assert
|
|
|
|
|
|
|
|
sed -i -e'/name: snapd/,+2d' $seed_yaml
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
|
|
|
|
# ignore
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
_snap_preseed() {
|
|
|
|
_snap_preseed() {
|
|
|
|
# Download the snap/assertion and add to the preseed
|
|
|
|
# Download the snap/assertion and add to the preseed
|
|
|
|
local CHROOT_ROOT=$1
|
|
|
|
local CHROOT_ROOT=$1
|
|
|
|
@ -436,6 +477,26 @@ _snap_preseed() {
|
|
|
|
return
|
|
|
|
return
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case $SNAP_NAME in
|
|
|
|
|
|
|
|
snapd)
|
|
|
|
|
|
|
|
# snapd is self-contained, ignore base
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
|
|
|
|
# Determine if and what core snap is needed
|
|
|
|
|
|
|
|
local core_snap=$(/usr/share/livecd-rootfs/snap-tool info \
|
|
|
|
|
|
|
|
--cohort-key="${COHORT_KEY:-}" \
|
|
|
|
|
|
|
|
--channel="$CHANNEL" "$SNAP_NAME" | \
|
|
|
|
|
|
|
|
grep '^base:' | awk '{print $2}'
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# If $core_snap is not the empty string then SNAP itself is not a core
|
|
|
|
|
|
|
|
# snap and we must additionally seed the core snap.
|
|
|
|
|
|
|
|
if [ -n "$core_snap" ]; then
|
|
|
|
|
|
|
|
_snap_preseed $CHROOT_ROOT $core_snap stable
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
sh -c "
|
|
|
|
sh -c "
|
|
|
|
set -x;
|
|
|
|
set -x;
|
|
|
|
cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
|
|
|
|
cd \"$CHROOT_ROOT/var/lib/snapd/seed\";
|
|
|
|
@ -466,6 +527,12 @@ EOF
|
|
|
|
|
|
|
|
|
|
|
|
echo -n " file: " >> $seed_yaml
|
|
|
|
echo -n " file: " >> $seed_yaml
|
|
|
|
(cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml
|
|
|
|
(cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# If $core_snap is the empty string then SNAP itself *may be* a core snap,
|
|
|
|
|
|
|
|
# and we run some post-processing logic.
|
|
|
|
|
|
|
|
if [ -z "$core_snap" ]; then
|
|
|
|
|
|
|
|
_snap_post_process $CHROOT_ROOT $SNAP_NAME
|
|
|
|
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
snap_prepare_assertions() {
|
|
|
|
snap_prepare_assertions() {
|
|
|
|
@ -544,15 +611,13 @@ snap_prepare() {
|
|
|
|
local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
|
|
|
|
local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic}
|
|
|
|
|
|
|
|
|
|
|
|
snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
|
|
|
|
snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL"
|
|
|
|
|
|
|
|
|
|
|
|
# Download the core snap
|
|
|
|
|
|
|
|
_snap_preseed $CHROOT_ROOT core stable
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
snap_preseed() {
|
|
|
|
snap_preseed() {
|
|
|
|
# Preseed a snap in the image (snap_prepare must be called once prior)
|
|
|
|
# Preseed a snap in the image (snap_prepare must be called once prior)
|
|
|
|
local CHROOT_ROOT=$1
|
|
|
|
local CHROOT_ROOT=$1
|
|
|
|
local SNAP=$2
|
|
|
|
local SNAP=$2
|
|
|
|
|
|
|
|
local SNAP_NAME=${SNAP%/*}
|
|
|
|
# Per Ubuntu policy, all seeded snaps (with the exception of the core
|
|
|
|
# Per Ubuntu policy, all seeded snaps (with the exception of the core
|
|
|
|
# snap) must pull from stable/ubuntu-$(release_ver) as their channel.
|
|
|
|
# snap) must pull from stable/ubuntu-$(release_ver) as their channel.
|
|
|
|
local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"}
|
|
|
|
local CHANNEL=${3:-"stable/ubuntu-$(release_ver)"}
|
|
|
|
@ -561,7 +626,15 @@ snap_preseed() {
|
|
|
|
echo "ERROR: Snap model assertion not present, snap_prepare must be called"
|
|
|
|
echo "ERROR: Snap model assertion not present, snap_prepare must be called"
|
|
|
|
exit 1
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
_snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
|
|
|
|
_snap_preseed $CHROOT_ROOT $SNAP $CHANNEL
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Mark this image as having snapd installed explicitly.
|
|
|
|
|
|
|
|
case $SNAP_NAME in
|
|
|
|
|
|
|
|
snapd)
|
|
|
|
|
|
|
|
touch "$CHROOT_ROOT/var/lib/snapd/seed/.snapd-explicit-install-stamp"
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
snap_from_seed() {
|
|
|
|
snap_from_seed() {
|
|
|
|
|
CloudBuilder
6 years ago