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

Imported 2.647

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-02-26 04:18:20 +00:00
parent 706784a90d
commit 3203b6f49e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.647) focal; urgency=medium
* Address snap base regression after snap-tool removal
-- Robert C Jennings <robert.jennings@canonical.com> Tue, 25 Feb 2020 16:15:48 -0600
livecd-rootfs (2.646) focal; urgency=medium livecd-rootfs (2.646) focal; urgency=medium
* Pass --verbose to `snap info` so that it includes the base. * Pass --verbose to `snap info` so that it includes the base.

15
live-build/functions
View File

@ -482,12 +482,16 @@ _snap_preseed() {
return return
fi fi
# Pre-seed snap's base
case $SNAP_NAME in case $SNAP_NAME in
snapd) snapd)
# snapd is self-contained, ignore base # snapd is self-contained, ignore base
;; ;;
core|core[0-9][0-9])
# core and core## are self-contained, ignore base
;;
*) *)
# Determine if and what core snap is needed # Determine which core snap is needed
local snap_info local snap_info
snap_info=$(snap info --verbose "${SNAP_NAME}") snap_info=$(snap info --verbose "${SNAP_NAME}")
@ -499,11 +503,10 @@ _snap_preseed() {
local core_snap=$(echo "$snap_info" | grep '^base:' | awk '{print $2}') 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 # If snap info does not list a base use 'core'
# snap and we must additionally seed the core snap. core_snap=${core_snap:-core}
if [ -n "$core_snap" ]; then
_snap_preseed $CHROOT_ROOT $core_snap stable _snap_preseed $CHROOT_ROOT $core_snap stable
fi
;; ;;
esac esac