|
|
@ -476,25 +476,14 @@ case $IMAGEFORMAT in
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
*) ;;
|
|
|
|
*) ;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
case $SUITE in
|
|
|
|
|
|
|
|
xenial)
|
|
|
|
# Ubuntu Core 24
|
|
|
|
# Ubuntu Core 16
|
|
|
|
# For now we stick to updating this by hand, but a more tasteful solution
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
|
|
|
# will follow
|
|
|
|
;;
|
|
|
|
CORE_MAJOR=24
|
|
|
|
bionic)
|
|
|
|
|
|
|
|
# Ubuntu Core 18
|
|
|
|
# Currently uc24 assertions do not support global channel overrides,
|
|
|
|
MODEL="ubuntu-core-18-${MODEL#pc-}"
|
|
|
|
# instead we have per-channel models
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
|
|
|
|
|
|
|
;;
|
|
|
|
|
|
|
|
*)
|
|
|
|
|
|
|
|
if [ "$SUITE" = "focal" ]; then
|
|
|
|
|
|
|
|
CORE_MAJOR=20
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
CORE_MAJOR=22
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Ubuntu Core 2x
|
|
|
|
|
|
|
|
# Currently uc2x assertions do not support global
|
|
|
|
|
|
|
|
# channel overrides, instead we have per-channel models
|
|
|
|
|
|
|
|
case $CHANNEL in
|
|
|
|
case $CHANNEL in
|
|
|
|
stable)
|
|
|
|
stable)
|
|
|
|
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
|
|
|
|
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
|
|
|
@ -516,8 +505,6 @@ case $IMAGEFORMAT in
|
|
|
|
exit 1
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
;;
|
|
|
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
amd64+kassel)
|
|
|
|
amd64+kassel)
|
|
|
|