Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a "with firmware" text to the DISKINFO string when appropriate

This commit is contained in:
Steve McIntyre 2019-11-08 14:42:44 +00:00
parent 8e0110075c
commit ac7792b8c1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/start_new_disc
View File

@ -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)