From ac7792b8c1cd3c1728a08bf10e827be81778dd3b Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Fri, 8 Nov 2019 14:42:44 +0000
Subject: [PATCH] Add a "with firmware" text to the DISKINFO string when
 appropriate

---
 tools/start_new_disc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/start_new_disc b/tools/start_new_disc
index fa720744..9908cf5f 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -55,12 +55,17 @@ if [ $NUM_ARCHES = 1 ] ; then
         *)
             BINARYDISK=1
 	    DISKNUMSTRING="$DISKNUM"
-            export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
+	    if [ "$FORCE_FIRMWARE"x = "1"x ] ; then
+	        FIRMWARE_TEXT=" with firmware"
+	    else
+	        FIRMWARE_TEXT=""
+	    fi
+            export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-${DISKNUM}${FIRMWARE_TEXT} $BUILD_DATE"
 	    if [ $DISKTYPE = NETINST ]; then
 		# Use "n" as a "disknum" here, #858031
 		DISKNUMSTRING="n"
 		# Don't need a disknum here - only one netinst
-		export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE $BUILD_DATE"
+		export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE${FIRMWARE_TEXT} $BUILD_DATE"
 	    fi
             case "$ARCHES" in
                 powerpc)