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

Check exit status of snap-tool info call while determining base snap

Browse Source
This commit is contained in:
Tobias Koch 2019-07-15 07:43:35 +02:00
parent 7ec97a627a
commit 18468c4218
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.600) UNRELEASED; urgency=medium
[ Tobias Koch ]
* Do proper error checking when calling snap-tool info to determine
the base of a snap.
-- Tobias Koch <tobias.koch@canonical.com> Mon, 15 Jul 2019 07:44:38 +0200
livecd-rootfs (2.599) eoan; urgency=medium
* Append the list of seeded snaps to manifests for all regular images.

16
live-build/functions
View File

@ -483,12 +483,20 @@ _snap_preseed() {
;;
*)
# Determine if and what core snap is needed
local core_snap=$(/usr/share/livecd-rootfs/snap-tool info \
local snap_info
snap_info=$(/usr/share/livecd-rootfs/snap-tool info \
--cohort-key="${COHORT_KEY:-}" \
--channel="$CHANNEL" "$SNAP_NAME" | \
grep '^base:' | awk '{print $2}'
--channel="$CHANNEL" "${SNAP_NAME}" \
)
if [ $? -ne 0 ]; then
echo "Failed to retrieve base of $SNAP_NAME!"
exit 1
fi
local core_snap=$(echo "$snap_info" | 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
@ -892,4 +900,4 @@ replace_kernel () {
install --assume-yes "${new_kernel}"
env DEBIAN_FRONTEND=noninteractive chroot "${mountpoint}" apt-get \
autoremove --purge --assume-yes
}
}