Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-08 16:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

We need to handle appliance images first before everything else.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2020-06-05 01:52:46 +02:00
parent 037c4e4ac6
commit 294db12c82
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
live-build/auto/config
View File

@ -180,6 +180,12 @@ case $IMAGEFORMAT in
BRAND_ID="canonical" BRAND_ID="canonical"
case "$ARCH+${SUBARCH:-}" in case "$ARCH+${SUBARCH:-}" in
# Handle appliance images
*+appliance-*)
BRAND_ID="ubuntu"
MODEL="${SUBARCH#appliance-}"
APPLIANCE=1
;;
amd64+*) amd64+*)
MODEL=pc-amd64 ;; MODEL=pc-amd64 ;;
i386+*) i386+*)
@ -192,12 +198,6 @@ case $IMAGEFORMAT in
MODEL=pi-arm64 ;; MODEL=pi-arm64 ;;
armhf+imx6) armhf+imx6)
MODEL=nitrogen6x ;; MODEL=nitrogen6x ;;
# Handle appliance images
*+appliance-*)
BRAND_ID="ubuntu"
MODEL="${SUBARCH#appliance-}"
APPLIANCE=1
;;
*) *)
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2 echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
exit 1 exit 1