From 6e8b5b94c4a9f8db4afbaf566ebdb36110f08592 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Fri, 1 May 2020 19:50:41 +0100
Subject: [PATCH] ubuntu-image: fix focal+ pi images for armhf to use pi-armhf
 model name.

LP: #1876358
---
 live-build/auto/config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/live-build/auto/config b/live-build/auto/config
index 088a6f19..fb6ca877 100755
--- a/live-build/auto/config
+++ b/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