Merge lp:~vorlon/livecd-rootfs/ubuntu-channels-for-snaps

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.508) UNRELEASED; urgency=medium
+
+  * Use Ubuntu-specific branches when seeding snaps, as required in
+    <https://wiki.ubuntu.com/UbuntuSeededSnaps>.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 16 Feb 2018 14:02:49 -0800
+
 livecd-rootfs (2.507) bionic; urgency=medium
 
   * ubuntu-server: generate multi-lowerdir overlayfs for

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 <<EOF >> 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