From e611dfc1c49aabfb591330a819f95ac6103699a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 25 May 2020 18:44:08 +0200 Subject: [PATCH] Enable overrides of UC20 grade dangerous channels --- debian/changelog | 7 +++++++ live-build/auto/config | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index ae987655..d0ff1e6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.664.3) UNRELEASED; urgency=medium + + * Enable overrides of UC20 grade dangerous channels - as this is possible. + (LP: #1879350) + + -- Łukasz 'sil2100' Zemczak Mon, 25 May 2020 16:40:27 +0200 + livecd-rootfs (2.664.2) focal; urgency=medium * Revert of initramfs package removal in KVM image (LP: #1880170) diff --git a/live-build/auto/config b/live-build/auto/config index 7ad94ccb..7a7fe245 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -396,6 +396,15 @@ case $IMAGEFORMAT in candidate|beta|edge|dangerous) MODEL="ubuntu-core-20-${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" + CHANNEL=${CHANNEL#dangerous-} + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL" + ;; *) echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}" exit 1