|
|
|
@ -174,6 +174,7 @@ case $IMAGEFORMAT in
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
ubuntu-image)
|
|
|
|
|
UBUNTU_IMAGE_ARGS=""
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
|
amd64+*)
|
|
|
|
|
MODEL=pc-amd64 ;;
|
|
|
|
@ -200,11 +201,17 @@ case $IMAGEFORMAT in
|
|
|
|
|
|
|
|
|
|
case $MODEL in
|
|
|
|
|
pc-amd64|pc-i386)
|
|
|
|
|
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
|
|
|
|
|
*)
|
|
|
|
|
UBUNTU_IMAGE_ARGS="" ;;
|
|
|
|
|
[ -z "${SUBARCH:-}" ] \
|
|
|
|
|
&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
|
amd64+kassel)
|
|
|
|
|
EXTRA_SNAPS="core bluez alsa-utils"
|
|
|
|
|
;;
|
|
|
|
|
*) ;;
|
|
|
|
|
esac
|
|
|
|
|
for snap in $EXTRA_SNAPS; do
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
|
|
|
|
|
done
|
|
|
|
@ -218,7 +225,6 @@ case $IMAGEFORMAT in
|
|
|
|
|
else
|
|
|
|
|
# classic images
|
|
|
|
|
|
|
|
|
|
UBUNTU_IMAGE_ARGS=""
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"
|
|
|
|
|
|
|
|
|
|