From 5d14722befa420f53267d7c747c59214a2ffc213 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Wed, 18 Aug 2021 13:18:54 +0000
Subject: [PATCH] Imported 2.664.28

No reason for CPC update specified.
---
 debian/changelog       | 12 ++++++++++++
 live-build/auto/config |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0c98f3d2..6f55b48e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.664.28) focal; urgency=medium
+
+  [ Brian Murray ]
+  * Make sure we're using the 'classic' branch for the intel-iot gadget.
+    (LP: #1938338)
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add support for passing SUBPROJECT to classic ubuntu-image calls. This
+    should fix running desktop-preinstalled builds. (LP: #1938338)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 16 Aug 2021 13:02:23 +0200
+
 livecd-rootfs (2.664.27) focal; urgency=medium
 
   * And whoops, we missed adding ARCH in the SUBARCH ubuntu-image handling for
diff --git a/live-build/auto/config b/live-build/auto/config
index fa655830..001dfb75 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -440,9 +440,11 @@ case $IMAGEFORMAT in
 					;;
 				intel-iot)
 					MODEL=pc
+					BRANCH=classic
 					;;
 			esac
 
+			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"