Support amd64+kassel in bionic

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.525.33) UNRELEASED; urgency=medium
+
+  * Add support for the 'kassel' subflavor of UC18 images. (LP: #1850674)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 30 Oct 2019 18:09:02 +0100
+
 livecd-rootfs (2.525.32) bionic; urgency=medium
 
   * Fix a terrible typo in auto/build that causes all core18 builds to fail on

live-build/auto/config

@@ -174,6 +174,7 @@ case $IMAGEFORMAT in
 		;;
 
 	ubuntu-image)
+		UBUNTU_IMAGE_ARGS=""
 		case "$ARCH+${SUBARCH:-}" in
 			amd64+*)
 				MODEL=pc-amd64 ;;
@@ -200,11 +201,17 @@ case $IMAGEFORMAT in
 
 			case $MODEL in
 				pc-amd64|pc-i386)
-					UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
+					[ -z "${SUBARCH:-}" ] \
-				*)
+					&& UBUNTU_IMAGE_ARGS="--image-size 3700M"
-					UBUNTU_IMAGE_ARGS="" ;;
+					;;
 			esac
 
+			case "$ARCH+${SUBARCH:-}" in
+				amd64+kassel)
+					EXTRA_SNAPS="core bluez alsa-utils"
+					;;
+				*) ;;
+			esac
 			for snap in $EXTRA_SNAPS; do
 				UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
 			done
@@ -218,7 +225,6 @@ case $IMAGEFORMAT in
 		else
 			# classic images
 
-			UBUNTU_IMAGE_ARGS=""
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"