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

Also add the firmware message for m-a disks

This commit is contained in:
Steve McIntyre 2019-11-08 15:00:48 +00:00
parent 926d5339f8
commit 6ae3a2fa6a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/start_new_disc
View File

@ -44,6 +44,12 @@ if [ "$DISKINFO_DISTRO"x = ""x ] ; then
fi fi
export DISKINFO_DISTRO export DISKINFO_DISTRO
if [ "$FORCE_FIRMWARE"x = "1"x ] ; then
FIRMWARE_TEXT=" with firmware"
else
FIRMWARE_TEXT=""
fi
if [ $NUM_ARCHES = 1 ] ; then if [ $NUM_ARCHES = 1 ] ; then
case $ARCHES in case $ARCHES in
source) source)
@ -55,11 +61,6 @@ if [ $NUM_ARCHES = 1 ] ; then
*) *)
BINARYDISK=1 BINARYDISK=1
DISKNUMSTRING="$DISKNUM" DISKNUMSTRING="$DISKNUM"
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" export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-${DISKNUM}${FIRMWARE_TEXT} $BUILD_DATE"
if [ $DISKTYPE = NETINST ]; then if [ $DISKTYPE = NETINST ]; then
# Use "n" as a "disknum" here, #858031 # Use "n" as a "disknum" here, #858031
@ -90,7 +91,7 @@ else
*source*) SOURCEDISK=1;; *source*) SOURCEDISK=1;;
esac esac
export ARCHDEF=`echo $ARCHES | sed 's? ?/?g'` export ARCHDEF=`echo $ARCHES | sed 's? ?/?g'`
export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE #$DISKNUM $BUILD_DATE" export DISKINFO="$DISKINFO_DISTRO ${DEBIAN_KERNEL} $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL Multi-architecture $ARCHDEF $DISKTYPE${FIRMWARE_TEXT} #$DISKNUM $BUILD_DATE"
export VOLID="$VOLID_BASE M-A $DISKNUM" export VOLID="$VOLID_BASE M-A $DISKNUM"
fi fi