Encode CHANNEL specification in the UC20 model names.

u-i-disk-info^2
Dimitri John Ledkov 5 years ago
parent 3b1047fbc2
commit 438606c5e8

1
debian/changelog vendored

@ -1,6 +1,7 @@
livecd-rootfs (2.641) UNRELEASED; urgency=medium livecd-rootfs (2.641) UNRELEASED; urgency=medium
* Configure a better nocloud datasource for subiquity cloud-init. * Configure a better nocloud datasource for subiquity cloud-init.
* Encode CHANNEL specification in the UC20 model names.
-- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 07 Feb 2020 22:11:26 +0000 -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 07 Feb 2020 22:11:26 +0000

@ -365,9 +365,20 @@ case $IMAGEFORMAT in
;; ;;
*) *)
# Ubuntu Core 20 # Ubuntu Core 20
# XXX: Currently uc20 assertions do not support global # Currently uc20 assertions do not support global
# channel overrides. # channel overrides, instead we have per-channel models
MODEL="ubuntu-core-20-${MODEL#pc-}" case $CHANNEL in
stable)
MODEL="ubuntu-core-20-${MODEL#pc-}"
;;
candidate|beta|edge|dangerous)
MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
;;
*)
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
exit 1
;;
esac
;; ;;
esac esac

Loading…
Cancel
Save