From bab506b82508c5f026f7bea95b97c5d36d478d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Tue, 21 Nov 2017 16:49:10 +0100
Subject: [PATCH] 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 | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/live-build/auto/config b/live-build/auto/config
index 5fad0f1b..76557c87 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -104,14 +104,16 @@ add_binary_hook ()
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
-case $PROJECT:$SUBPROJECT in
-	ubuntu-cpc:*)
-		IMAGEFORMAT=ext4
-		;;
-	ubuntu-server:live)
-		IMAGEFORMAT=plain
-		;;
-esac
+if [ -z "${IMAGEFORMAT:-}" ]; then
+	case $PROJECT:$SUBPROJECT in
+		ubuntu-cpc:*)
+			IMAGEFORMAT=ext4
+			;;
+		ubuntu-server:live)
+			IMAGEFORMAT=plain
+			;;
+	esac
+fi
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)