Do it even better.

5 years ago · 037c4e4ac6
parent 61eae75d5e
commit 037c4e4ac6
1 changed files with 3 additions and 5 deletions
--- a/live-build/auto/config
+++ b/live-build/auto/config
@ -193,12 +193,10 @@ case $IMAGEFORMAT in
 			armhf+imx6)
 				MODEL=nitrogen6x ;;
 			# Handle appliance images
-			*+appliance_*)
+			*+appliance-*)
 				BRAND_ID="ubuntu"
-				COMPOSED="${SUBARCH#appliance_}"
-				APPLIANCE="${COMPOSED%_*}"
-				DEVICE="${COMPOSED#*_}"
-				MODEL="${APPLIANCE}-core18-${DEVICE}"
+				MODEL="${SUBARCH#appliance-}"
+				APPLIANCE=1
 				;;
 			*)
 				echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2