We need to handle appliance images first before everything else.

5 years ago · 294db12c82
parent 037c4e4ac6
commit 294db12c82
1 changed files with 6 additions and 6 deletions
--- 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