From 7b264f4d10a848ec4f739ede970169e1b8b7bcf3 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 12 Oct 2018 21:06:09 +0000 Subject: [PATCH] Imported 2.542 No reason for CPC update specified. --- debian/changelog | 8 ++++++++ live-build/auto/config | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0c1e3411..50ee1908 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.542) cosmic; urgency=medium + + * Decide what model assertion series to fetch depending on the suite. Use 16 + for xenial and 18 for other series (bionic+). This enables core18 image + builds. + + -- Łukasz 'sil2100' Zemczak Wed, 03 Oct 2018 11:51:59 +0200 + livecd-rootfs (2.541) cosmic; urgency=medium [ Michael Hudson-Doyle ] diff --git a/live-build/auto/config b/live-build/auto/config index 5ab67fac..75fd11aa 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -185,6 +185,14 @@ case $IMAGEFORMAT in *) UBUNTU_IMAGE_ARGS="" ;; esac + case $SUITE in + xenial) + # Ubuntu Core 16 + ;; + *) + # Ubuntu Core 18 + MODEL="ubuntu-core-18-${MODEL#pc-}" ;; + esac echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common