From 2ffcfdfed7519b0081c2487c794c8e5dbc4fc535 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Tue, 28 Jul 2020 20:47:30 +0000
Subject: [PATCH] Imported 2.525.44

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

diff --git a/debian/changelog b/debian/changelog
index 474e24b4..3e103094 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.525.44) bionic; urgency=medium
+
+  * Add support for building uc18 appliance images (LP: #1887673).
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 07 May 2020 18:38:54 +0200
+
 livecd-rootfs (2.525.43) bionic; urgency=medium
 
   [ David Krauser ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 8123e07e..03d88193 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -177,7 +177,15 @@ case $IMAGEFORMAT in
 
 	ubuntu-image)
 		UBUNTU_IMAGE_ARGS=""
+		BRAND_ID="canonical"
+
 		case "$ARCH+${SUBARCH:-}" in
+			# Handle appliance images
+			*+appliance-*)
+				BRAND_ID="ubuntu"
+				MODEL="${SUBARCH#appliance-}"
+				APPLIANCE=1
+				;;
 			amd64+*)
 				MODEL=pc-amd64 ;;
 			i386+*)
@@ -218,7 +226,9 @@ case $IMAGEFORMAT in
 					;;
 				*)
 					# Ubuntu Core 18
-					MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
+					[ -z "${APPLIANCE:-}" ] \
+					&& MODEL="ubuntu-core-18-${MODEL#pc-}"
+					;;
 			esac
 
 			case "$ARCH+${SUBARCH:-}" in
@@ -233,7 +243,7 @@ case $IMAGEFORMAT in
 			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 			echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 			# Store model assertion in top dir to get it picked up later as a build artifact
-			env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
+			env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id="$BRAND_ID" > "$PREFIX".model-assertion
 			echo "Configured ubuntu-image for the following model assertion:"
 			cat "$PREFIX".model-assertion
 			echo "----------------------------------------------------------"