From dd2d72654a829c81312571b88eddac429f568d5c Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Thu, 19 Mar 2020 13:50:49 +0000
Subject: [PATCH] Imported 2.408.58

No reason for CPC update specified.
---
 debian/changelog     | 6 ++++++
 live-build/functions | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 323a9ced..a1e982bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.408.58) 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.57) xenial; urgency=medium
 
   * Preserve apt preferences created by any package we install (i.e.
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 "