From 136562b837183ce48ac7bb5400ac9537ee555e5d Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Wed, 29 Jul 2020 14:42:26 -0500 Subject: [PATCH] Handle seeded lxd snap with channel name for ubuntu-cpc:minimized (LP: #1889470) The seed now specifies the lxd snap in focal as 'lxd=4.0/stable/ubuntu-20.04' which doesn't match the expectations of the code with looks for lxd as the only snap in the seed for minimized images. This patch updates the pattern to accept 'lxd' or 'lxd=*'. --- debian/changelog | 7 +++++++ live-build/auto/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e8ada272..066dab56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.664.5) focal; urgency=medium + + * Handle seeded lxd snap with channel name for ubuntu-cpc:minimized + (LP: #1889470) + + -- Robert C Jennings Wed, 29 Jul 2020 14:54:19 -0500 + livecd-rootfs (2.664.4) focal; urgency=medium * snap_preseed: support channel specification with snap name (LP: #1882374) diff --git a/live-build/auto/config b/live-build/auto/config index 0e9735c5..761dd429 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -894,7 +894,7 @@ if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-cpc:minimized ]; then # build if we see such a snap. for snap in `cat config/seeded-snaps`; do case $snap in - lxd) + lxd | lxd=*) ;; *) echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap"