Merge branch 'xnox/fix-pi-models' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

debian/changelog

@@ -2,8 +2,10 @@ livecd-rootfs (2.664ubuntu1) UNRELEASED; urgency=medium
 
   * Bump only the UC20 pc image to 8GB, and keep Pi images as small as possible.
     (LP: #1875430)
+  * ubuntu-image: fix focal+ pi images for armhf to use pi-armhf model name.
+    (LP: #1876358)
 
- -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 01 May 2020 19:47:10 +0100
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 01 May 2020 19:51:57 +0100
 
 livecd-rootfs (2.664) focal; urgency=medium
 

live-build/auto/config

@@ -383,6 +383,9 @@ case $IMAGEFORMAT in
 					UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
 					;;
 				*)
+					if [ "${MODEL}" = "pi" ]; then
+						MODEL=pi-armhf
+					fi
 					# Ubuntu Core 20
 					# Currently uc20 assertions do not support global
 					# channel overrides, instead we have per-channel models