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

Imported 2.671

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-07-10 05:54:23 +00:00
parent baca55b13a
commit f06b4252a9
2 changed files with 13 additions and 2 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.671) groovy; urgency=medium
* Fix-up seeding snaps with tracks.
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 10 Jul 2020 01:55:47 +0100
livecd-rootfs (2.670) groovy; urgency=medium livecd-rootfs (2.670) groovy; urgency=medium
* snap_preseed: support channel specification with snap name (LP: #1882374) * snap_preseed: support channel specification with snap name (LP: #1882374)

9
live-build/functions
View File

@ -634,9 +634,9 @@ snap_preseed() {
# $2 can be in the form of snap_name/classic=track/risk/branch # $2 can be in the form of snap_name/classic=track/risk/branch
local SNAP=$2 local SNAP=$2
# strip CHANNEL specification # strip CHANNEL specification
local SNAP_NAME=${SNAP%=*} SNAP=${SNAP%=*}
# strip /classic confinement # strip /classic confinement
SNAP_NAME=${SNAP_NAME%/*} local SNAP_NAME=${SNAP%/*}
# Seed from the specified channel (e.g. core18 latest/stable) # Seed from the specified channel (e.g. core18 latest/stable)
# Or Channel endcoded in the snap name (e.g. lxd=4.0/stable/ubuntu-20.04) # Or Channel endcoded in the snap name (e.g. lxd=4.0/stable/ubuntu-20.04)
# Or Ubuntu policy default channel latest/stable/ubuntu-$(release_ver) # Or Ubuntu policy default channel latest/stable/ubuntu-$(release_ver)
@ -652,6 +652,11 @@ snap_preseed() {
esac esac
fi fi
# At this point:
# SNAP_NAME is just the snap name
# SNAP is either $SNAP_NAME or $SNAP_NAME/classic for classic confined
# CHANNEL is the channel
if [ ! -e "$CHROOT_ROOT/var/lib/snapd/seed/assertions/model" ]; then if [ ! -e "$CHROOT_ROOT/var/lib/snapd/seed/assertions/model" ]; then
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