Imported 2.631

No reason for CPC update specified.

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

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