Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.

BuildLiveCD

@@ -36,7 +36,7 @@ LIVE_BUILD=false
 while getopts :s:d:f:pa:l name; do case $name in
     s)	SUBARCH="$OPTARG";;
     d)	NEWSUITE="$OPTARG";;
-    f)	IMAGEFORMAT="-f$OPTARG";;
+    f)	IMAGEFORMAT="$OPTARG";;
     p)	PROPOSED="-p";;
     a)	APT_SOURCE="-A $OPTARG";;
     l)	LIVE_BUILD=:;;
@@ -143,7 +143,7 @@ for STE in $SUITES; do
 	fi
 	COMMAND="PROJECT=${FS} ARCH=${ARCH} SUBARCH=${SUBARCH} lb build"
     else
-	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
+	COMMAND="/usr/sbin/livecd.sh ${SUBARCHARG} ${APT_SOURCE} ${PROPOSED} -d${STE} ${IMAGEFORMAT:+-f$IMAGEFORMAT} ${ARCHARG} ${IMAGEARG} ${FS}"
     fi
     if $LINUX32 sudo chroot ${DIR%/./*} sh -c "cd /${DIR#*/./} && $COMMAND" >> ${LOG} 2>&1; then
 	rm -f ${PUBDIR}current

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.5) UNRELEASED; urgency=low
+
+  * Pass correct IMAGEFORMAT through to live-build from BuildLiveCD.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 15 Jun 2011 10:21:08 +0100
+
 livecd-rootfs (2.4) oneiric; urgency=low
 
   * Remove old config directory before creating a new configuration.