From ed8d11d25b8bd713ad8d081c0a7d19a3dac315b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 19 Jun 2023 10:06:10 +0200 Subject: [PATCH] Follow up fix to the CHANNEL handling for subiquity images --- debian/changelog | 7 +++++++ live-build/ubuntu/hooks/020-canary-enhanced-sb.binary | 4 +++- live-build/ubuntu/hooks/020-canary-live.binary | 4 +++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 63e3c70d..9cb24798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.891) UNRELEASED; urgency=medium + + * Follow up fix to the CHANNEL handling for subiquity images: make sure that + we include config/binary, as that's where CHANNEL is passed over. + + -- Łukasz 'sil2100' Zemczak Mon, 19 Jun 2023 10:03:52 +0200 + livecd-rootfs (2.890) mantic; urgency=medium * Allow choosing installer channels with the CHANNEL variable for diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index befa36ec..9d75e904 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -19,6 +19,8 @@ case ${SUBPROJECT:-} in ;; esac +. config/binary + # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2304-amd64 > config/classic-model.model cat < config/classic-model.model type: model @@ -108,7 +110,7 @@ WiXM9CPKCZv/Es3uOp/ke0wWL7v0MZhzUJ+QhOtTNg== EOF channel="" -if [ -n "$CHANNEL" ]; then +if [ -n "${CHANNEL:-}" ]; then channel="--channel $CHANNEL" fi env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ diff --git a/live-build/ubuntu/hooks/020-canary-live.binary b/live-build/ubuntu/hooks/020-canary-live.binary index d3582a95..2aa77e78 100755 --- a/live-build/ubuntu/hooks/020-canary-live.binary +++ b/live-build/ubuntu/hooks/020-canary-live.binary @@ -19,6 +19,8 @@ case ${SUBPROJECT:-} in ;; esac +. config/binary + # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-installer-classic-2304-amd64 > config/classic-model-installer.model cat < config/classic-model-installer.model type: model @@ -64,7 +66,7 @@ c3kEHr8kcSEkJtgwre/RjjlvGYhur1rZ4i0G6gGBLw== EOF channel="" -if [ -n "$CHANNEL" ]; then +if [ -n "${CHANNEL:-}" ]; then channel="--channel $CHANNEL" fi env SNAPPY_STORE_NO_CDN=1 snap prepare-image \