From f807c3703a67b70a1f52ec585e0a252ca9df742a Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint.reczey@canonical.com>
Date: Fri, 28 Apr 2017 22:27:50 +0200
Subject: [PATCH] Allow overriding IMAGEFORMAT even for ubuntu-cpc and
 ubuntu-server

---
 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 77c33db4..4f1feb52 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)