diff --git a/debian/changelog b/debian/changelog index e7f7ebe7..a3a83b5f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.504) UNRELEASED; urgency=medium + + * Use Ubuntu-specific branches when seeding snaps, as required in + . + + -- Steve Langasek Fri, 16 Feb 2018 14:02:49 -0800 + livecd-rootfs (2.503) bionic; urgency=medium * Install linux-signed-generic in the live-server image. (LP: #1749065) diff --git a/live-build/auto/build b/live-build/auto/build index 41c887cd..5c0b1ed6 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -35,6 +35,8 @@ Setup_cleanup preinstall_snaps() { lb chroot_resolv install + snap_channel="stable/ubuntu-$(distro-info --series="$LB_DISTRIBUTION" \ + -r | awk '{ print $1 }')" chroot chroot sh -c ' set -x; cd /var/lib/snapd/seed; @@ -43,7 +45,7 @@ preinstall_snaps() { chroot chroot sh -c " set -x; cd /var/lib/snapd/seed; - SNAPPY_STORE_NO_CDN=1 snap download \"${snap%/*}\"" + SNAPPY_STORE_NO_CDN=1 snap download --channel=$snap_channel \"${snap%/*}\"" done lb chroot_resolv remove @@ -59,7 +61,7 @@ EOF snap_name=${snap%/*} cat <> chroot/var/lib/snapd/seed/seed.yaml - name: ${snap_name} - channel: stable + channel: $snap_channel EOF case ${snap} in */classic) echo " classic: true" >> chroot/var/lib/snapd/seed/seed.yaml;; esac echo -n " file: " >> chroot/var/lib/snapd/seed/seed.yaml