From 438606c5e8359c6a005402e6ddaea42b38432e54 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Fri, 7 Feb 2020 22:18:04 +0000 Subject: [PATCH] Encode CHANNEL specification in the UC20 model names. --- debian/changelog | 1 + live-build/auto/config | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce0ec646..24a09c89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Fri, 07 Feb 2020 22:11:26 +0000 diff --git a/live-build/auto/config b/live-build/auto/config index 3f1dcdb6..0dcc08ff 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -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