From ace52c572bcb0fe916952c81f75c01b9205de5b9 Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Fri, 21 Feb 2020 21:31:29 -0600
Subject: [PATCH] Use a snap cohort key for consistent parallel builds (LP:
 #1866159)

---
 debian/changelog     | 6 ++++++
 live-build/functions | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 234994c8..d12f5dd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.408.57) xenial; urgency=medium
+
+  * Use a snap cohort key for consistent parallel builds (LP: #1866159)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Fri, 21 Feb 2020 21:32:37 -0600
+
 livecd-rootfs (2.408.56) xenial; urgency=medium
 
   * Backport enabling of adding extra snaps to ubuntu-core images via the
diff --git a/live-build/functions b/live-build/functions
index 11f3b119..fff3d679 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -367,6 +367,7 @@ _snap_preseed() {
         set -x;
         cd /var/lib/snapd/seed;
         SNAPPY_STORE_NO_CDN=1 snap download \
+            --cohort="${COHORT_KEY:-}" \
             --channel=$CHANNEL \"$SNAP_NAME\"" || snap_download_failed=1
     if [ $snap_download_failed = 1 ] ; then
         echo "If the channel ($CHANNEL) includes '*/ubuntu-##.##' track per "