From c9b40d078db3dcb037a853fd05919225fd34d641 Mon Sep 17 00:00:00 2001
From: CloudBuilder <cloud-image-builders@lists.canonical.com>
Date: Wed, 11 Dec 2019 22:18:24 +0000
Subject: [PATCH] Imported 2.631

No reason for CPC update specified.
---
 debian/changelog       | 6 ++++++
 live-build/auto/config | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e74c304d..b0e6cc15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.631) focal; urgency=medium
+
+  * Add support for uc20 model assertions.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 10 Dec 2019 15:27:39 +0100
+
 livecd-rootfs (2.630) focal; urgency=medium
 
   * Drop installing dummy transitional linux-signed-generic, these days
diff --git a/live-build/auto/config b/live-build/auto/config
index c267028f..b6e31039 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -356,9 +356,12 @@ case $IMAGEFORMAT in
 				xenial)
 					# Ubuntu Core 16
 					;;
-				*)
+				bionic)
 					# Ubuntu Core 18
 					MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
+				*)
+					# Ubuntu Core 20
+					MODEL="ubuntu-core-20-${MODEL#pc-}" ;;
 			esac
 
 			case "$ARCH+${SUBARCH:-}" in