From 42f2ccd60a3f81971e87603027854b348e2485c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Tue, 12 Nov 2019 21:20:59 +0100
Subject: [PATCH] Enable core18 builds

---
 debian/changelog       | 8 ++++++++
 live-build/auto/config | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index cce06647..8a78179b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.525.35) UNRELEASED; urgency=medium
+
+  * Did not expect the bionic branch being so outdated. Backport support
+    for fetching core18 model assertions on bionic hosts. This enables build
+    support for ubuntu-core 18 images. (LP: #1852332)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 12 Nov 2019 21:05:29 +0100
+
 livecd-rootfs (2.525.34) bionic; urgency=medium
 
   * Add support for HyperV Gallery Images (LP: #1837088)
diff --git a/live-build/auto/config b/live-build/auto/config
index 6a31ffae..4f025b66 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -205,6 +205,14 @@ case $IMAGEFORMAT in
 					&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
 					;;
 			esac
+			case $SUITE in
+				xenial)
+					# Ubuntu Core 16
+					;;
+				*)
+					# Ubuntu Core 18
+					MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
+			esac
 
 			case "$ARCH+${SUBARCH:-}" in
 				amd64+kassel)