Follow up fix to the CHANNEL handling for subiquity images

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 <lukasz.zemczak@ubuntu.com>  Mon, 19 Jun 2023 10:03:52 +0200
+
 livecd-rootfs (2.890) mantic; urgency=medium
 
   * Allow choosing installer channels with the CHANNEL variable for

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 <<EOF > 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 \

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 <<EOF > 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 \