From 54408aa50613316ff7698fbfcdc86ed23317ca47 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue, 6 Mar 2018 10:15:43 +0100
Subject: [PATCH] Import patches-unapplied version 2.508 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 300abafa6e2ab8de60cbe0024b77855c12f72946

New changelog entries:
  * Use Ubuntu-specific branches when seeding snaps, as required in
    <https://wiki.ubuntu.com/UbuntuSeededSnaps>.
  * Add dependency on distro-info for the above.
---
 debian/changelog      | 8 ++++++++
 debian/control        | 1 +
 live-build/auto/build | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 72147a8a..dc4e4063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.508) bionic; urgency=medium
+
+  * Use Ubuntu-specific branches when seeding snaps, as required in
+    <https://wiki.ubuntu.com/UbuntuSeededSnaps>.
+  * Add dependency on distro-info for the above.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 06 Mar 2018 10:15:43 +0100
+
 livecd-rootfs (2.507) bionic; urgency=medium
 
   * ubuntu-server: generate multi-lowerdir overlayfs for
diff --git a/debian/control b/debian/control
index c66d3901..f6468b91 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Architecture: any
 Depends: ${misc:Depends},
          apt-utils,
          debootstrap,
+         distro-info,
          dosfstools,
          e2fsprogs,
          gdisk,
diff --git a/live-build/auto/build b/live-build/auto/build
index 20a2d551..e28e6ca7 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 <<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