|
|
|
|
@ -381,25 +381,30 @@ case $IMAGEFORMAT in
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
if [ "$SUITE" = "focal" ]; then
|
|
|
|
|
CORE_MAJOR=20
|
|
|
|
|
else
|
|
|
|
|
CORE_MAJOR=22
|
|
|
|
|
fi
|
|
|
|
|
if [ "${MODEL}" = "pi" ]; then
|
|
|
|
|
MODEL=pi-armhf
|
|
|
|
|
fi
|
|
|
|
|
# Ubuntu Core 20
|
|
|
|
|
# Currently uc20 assertions do not support global
|
|
|
|
|
# Ubuntu Core 2x
|
|
|
|
|
# Currently uc2x assertions do not support global
|
|
|
|
|
# channel overrides, instead we have per-channel models
|
|
|
|
|
case $CHANNEL in
|
|
|
|
|
stable)
|
|
|
|
|
MODEL="ubuntu-core-20-${MODEL#pc-}"
|
|
|
|
|
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
|
|
|
|
|
;;
|
|
|
|
|
candidate|beta|edge|dangerous)
|
|
|
|
|
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
|
|
|
|
|
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-${CHANNEL}"
|
|
|
|
|
;;
|
|
|
|
|
dangerous-*)
|
|
|
|
|
# That being said, the dangerous grade *does*
|
|
|
|
|
# support channel overrides, so we can use the
|
|
|
|
|
# dangerous model assertion and override the channel
|
|
|
|
|
# freely.
|
|
|
|
|
MODEL="ubuntu-core-20-${MODEL#pc-}-dangerous"
|
|
|
|
|
MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous"
|
|
|
|
|
CHANNEL=${CHANNEL#dangerous-}
|
|
|
|
|
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
|
|
|
|
|
;;
|
|
|
|
|
|
Dimitri John Ledkov
4 years ago