Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encode CHANNEL specification in the UC20 model names.

Browse Source
This commit is contained in:
Dimitri John Ledkov 2020-02-07 22:18:04 +00:00
parent 3b1047fbc2
commit 438606c5e8
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (2.641) UNRELEASED; urgency=medium
* 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

17
live-build/auto/config
View File

@ -365,9 +365,20 @@ case $IMAGEFORMAT in
;;
*)
# Ubuntu Core 20
# XXX: Currently uc20 assertions do not support global
# channel overrides.
MODEL="ubuntu-core-20-${MODEL#pc-}"
# Currently uc20 assertions do not support global
# channel overrides, instead we have per-channel models
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