From 1498baada550d381d1aff7833bc8638b3f4be461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 10 Oct 2018 21:57:55 +0200 Subject: [PATCH] The model assertions for 18 don't actually use series=18 because that would be too logical. --- live-build/auto/config | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index 7cfd4c17..6d4b9086 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -187,15 +187,17 @@ case $IMAGEFORMAT in esac case $SUITE in xenial) - CORE_SERIES=16 ;; + # Ubuntu Core 16 + ;; *) - CORE_SERIES=18 ;; + # Ubuntu Core 18 + MODEL="ubuntu-core-18-$MODEL" ;; esac echo "IMAGEFORMAT=$IMAGEFORMAT" >> 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 - env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=$CORE_SERIES model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion + env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion echo "Configured ubuntu-image for the following model assertion:" cat "$PREFIX".model-assertion echo "----------------------------------------------------------"