From 294db12c824726508d1b99c4600b047daddbc565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Fri, 5 Jun 2020 01:52:46 +0200
Subject: [PATCH] We need to handle appliance images first before everything
 else.

---
 live-build/auto/config | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index b480a332..7bb30f64 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -180,6 +180,12 @@ case $IMAGEFORMAT in
 		BRAND_ID="canonical"
 
 		case "$ARCH+${SUBARCH:-}" in
+			# Handle appliance images
+			*+appliance-*)
+				BRAND_ID="ubuntu"
+				MODEL="${SUBARCH#appliance-}"
+				APPLIANCE=1
+				;;
 			amd64+*)
 				MODEL=pc-amd64 ;;
 			i386+*)
@@ -192,12 +198,6 @@ case $IMAGEFORMAT in
 				MODEL=pi-arm64 ;;
 			armhf+imx6)
 				MODEL=nitrogen6x ;;
-			# Handle appliance images
-			*+appliance-*)
-				BRAND_ID="ubuntu"
-				MODEL="${SUBARCH#appliance-}"
-				APPLIANCE=1
-				;;
 			*)
 				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
 				exit 1