From c184977a90ff187acd4e3f18fff4ae5d853b5852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 3 Oct 2018 11:51:49 +0200 Subject: [PATCH] Decide what model assertion series to fetch depending on the suite. For xenial use 16 and for others (so bionic+): 18. --- live-build/auto/config | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 5ab67fac..7cfd4c17 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -185,11 +185,17 @@ case $IMAGEFORMAT in *) UBUNTU_IMAGE_ARGS="" ;; esac + case $SUITE in + xenial) + CORE_SERIES=16 ;; + *) + CORE_SERIES=18 ;; + 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=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion + env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=$CORE_SERIES model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion echo "Configured ubuntu-image for the following model assertion:" cat "$PREFIX".model-assertion echo "----------------------------------------------------------"