Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-06 15:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up fix to the CHANNEL handling for subiquity images

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-06-19 10:06:10 +02:00
parent d702ed08a6
commit ed8d11d25b
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 livecd-rootfs (2.890) mantic; urgency=medium
* Allow choosing installer channels with the CHANNEL variable for * Allow choosing installer channels with the CHANNEL variable for

4
live-build/ubuntu/hooks/020-canary-enhanced-sb.binary
View File

@ -19,6 +19,8 @@ case ${SUBPROJECT:-} in
;; ;;
esac 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 # 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 cat <<EOF > config/classic-model.model
type: model type: model
@ -108,7 +110,7 @@ WiXM9CPKCZv/Es3uOp/ke0wWL7v0MZhzUJ+QhOtTNg==
EOF EOF
channel="" channel=""
if [ -n "$CHANNEL" ]; then if [ -n "${CHANNEL:-}" ]; then
channel="--channel $CHANNEL" channel="--channel $CHANNEL"
fi fi
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ env SNAPPY_STORE_NO_CDN=1 snap prepare-image \

4
live-build/ubuntu/hooks/020-canary-live.binary
View File

@ -19,6 +19,8 @@ case ${SUBPROJECT:-} in
;; ;;
esac 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 # 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 cat <<EOF > config/classic-model-installer.model
type: model type: model
@ -64,7 +66,7 @@ c3kEHr8kcSEkJtgwre/RjjlvGYhur1rZ4i0G6gGBLw==
EOF EOF
channel="" channel=""
if [ -n "$CHANNEL" ]; then if [ -n "${CHANNEL:-}" ]; then
channel="--channel $CHANNEL" channel="--channel $CHANNEL"
fi fi
env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ env SNAPPY_STORE_NO_CDN=1 snap prepare-image \