For the IMAGEFORMAT=none parts to work for ubuntu-image classic builds, we need to make sure IMAGEFORMAT is preserved and not overwritten if defined. Backporting from trunk.

live-build/auto/config

@@ -104,14 +104,16 @@ add_binary_hook ()
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
-case $PROJECT:$SUBPROJECT in
+if [ -z "${IMAGEFORMAT:-}" ]; then
-	ubuntu-cpc:*)
+	case $PROJECT:$SUBPROJECT in
-		IMAGEFORMAT=ext4
+		ubuntu-cpc:*)
-		;;
+			IMAGEFORMAT=ext4
-	ubuntu-server:live)
+			;;
-		IMAGEFORMAT=plain
+		ubuntu-server:live)
-		;;
+			IMAGEFORMAT=plain
-esac
+			;;
+	esac
+fi
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)