From 2f84bc9a8426feeff0ac59ad01419ae2da8010d3 Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 2 Dec 2020 11:05:18 +0000
Subject: [PATCH] config: on hirsute build UC22 images

---
 live-build/auto/config | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index 67e59108..34a765aa 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -381,25 +381,30 @@ case $IMAGEFORMAT in
 					UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
 					;;
 				*)
+					if [ "$SUITE" = "focal" ]; then
+						CORE_MAJOR=20
+					else
+						CORE_MAJOR=22
+					fi
 					if [ "${MODEL}" = "pi" ]; then
 						MODEL=pi-armhf
 					fi
-					# Ubuntu Core 20
-					# Currently uc20 assertions do not support global
+					# Ubuntu Core 2x
+					# Currently uc2x assertions do not support global
 					# channel overrides, instead we have per-channel models
 					case $CHANNEL in
 						stable)
-							MODEL="ubuntu-core-20-${MODEL#pc-}"
+							MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
 							;;
 						candidate|beta|edge|dangerous)
-							MODEL="ubuntu-core-20-${MODEL#pc-}-${CHANNEL}"
+							MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-${CHANNEL}"
 							;;
 						dangerous-*)
 							# That being said, the dangerous grade *does*
 							# support channel overrides, so we can use the
 							# dangerous model assertion and override the channel
 							# freely.
-							MODEL="ubuntu-core-20-${MODEL#pc-}-dangerous"
+							MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous"
 							CHANNEL=${CHANNEL#dangerous-}
 							UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
 							;;