Imported 2.679

No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2020-07-30 06:54:51 +00:00
parent d5647bfcf3
commit d9201b4a89
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.679) groovy; urgency=medium
* Handle seeded lxd snap with channel name for ubuntu-cpc:minimized
(LP: #1889470)
-- Robert C Jennings <robert.jennings@canonical.com> Wed, 29 Jul 2020 14:55:57 -0500
livecd-rootfs (2.678) groovy; urgency=medium livecd-rootfs (2.678) groovy; urgency=medium
[ David Krauser ] [ David Krauser ]

View File

@ -872,7 +872,7 @@ if [ "$PROJECT:${SUBPROJECT:-}" = ubuntu-cpc:minimized ]; then
# build if we see such a snap. # build if we see such a snap.
for snap in `cat config/seeded-snaps`; do for snap in `cat config/seeded-snaps`; do
case $snap in case $snap in
lxd) lxd | lxd=*)
;; ;;
*) *)
echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap" echo "Unexpected seeded snap for ubuntu-cpc:minimized build: $snap"