From 4c3694d4a2b50dd2faa9ee66575645d5b3315179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@ubuntu.com>
Date: Tue, 21 Nov 2017 17:01:14 +0100
Subject: [PATCH] Import patches-unapplied version 2.408.24 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 16c064a241388be65a8193c001dffb05d5a028fc

New changelog entries:
  * 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 artful.
---
 debian/changelog       |  8 ++++++++
 live-build/auto/config | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 827a90e4..4efb89f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.408.24) xenial; urgency=medium
+
+  * 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 artful.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 21 Nov 2017 17:01:14 +0100
+
 livecd-rootfs (2.408.23) xenial; urgency=medium
 
   [ Gary Wang ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 3eb8dae8..badff46a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -107,11 +107,13 @@ add_binary_hook ()
 	BINARY_HOOKS="${BINARY_HOOKS:+$BINARY_HOOKS }$1"
 }
 
-case $PROJECT in
-	ubuntu-cpc)
-		IMAGEFORMAT=ext4
-		;;
-esac
+if [ -z "${IMAGEFORMAT:-}" ]; then
+	case $PROJECT in
+		ubuntu-cpc)
+			IMAGEFORMAT=ext4
+			;;
+	esac
+fi
 
 case $IMAGEFORMAT in
 	ext2|ext3|ext4)