Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-08 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make sure the brand-id is properly selected, allow channel overrides.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2020-06-23 15:30:26 +02:00
parent 8e70f5e2a5
commit 4769d734b2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
live-build/auto/config
View File

@ -356,6 +356,7 @@ case $IMAGEFORMAT in
if [ $PROJECT = "ubuntu-core" ]; then if [ $PROJECT = "ubuntu-core" ]; then
# snap-based core images # snap-based core images
BRAND="canonical"
CHANNEL="${CHANNEL:-edge}" CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64|pc-i386)
@ -381,8 +382,16 @@ case $IMAGEFORMAT in
# Ubuntu Core 18 # Ubuntu Core 18
MODEL="ubuntu-core-18-${MODEL#pc-}" MODEL="ubuntu-core-18-${MODEL#pc-}"
case $CHANNEL in case $CHANNEL in
appliance*) # Support a special-case channel for appliance images
appliance-*)
# Allow overriding the stability level for appliances
CHANNEL="${CHANNEL#appliance-}"
BRAND="ubuntu"
;;
appliance)
# Default appliance image
CHANNEL="stable" CHANNEL="stable"
BRAND="ubuntu"
;; ;;
esac esac
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
@ -430,7 +439,7 @@ case $IMAGEFORMAT in
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact # Store model assertion in top dir to get it picked up later as a build artifact
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=$BRAND > "$PREFIX".model-assertion
echo "Configured ubuntu-image for the following model assertion:" echo "Configured ubuntu-image for the following model assertion:"
cat "$PREFIX".model-assertion cat "$PREFIX".model-assertion
echo "----------------------------------------------------------" echo "----------------------------------------------------------"