From 8c9457ed300d6b954d85354b5483fb6c0db070ce Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sat, 8 Jan 2011 23:35:59 +0000
Subject: [PATCH] remove the Bin- and Src- components from the volid; xorriso
 is picky

---
 tools/start_new_disc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/start_new_disc b/tools/start_new_disc
index f4fa7293..4b648563 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -35,7 +35,7 @@ if [ $NUM_ARCHES = 1 ] ; then
 		source)
 			SOURCEDISK=1
 			export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $DISKTYPE Source-$DISKNUM $BUILD_DATE"
-			export VOLID="$VOLID_BASE Src-$DISKNUM"
+			export VOLID="$VOLID_BASE Source $DISKNUM"
 			export SOURCEONLY=yes
 			;;
 		*)
@@ -43,13 +43,13 @@ if [ $NUM_ARCHES = 1 ] ; then
 			export DISKINFO="Debian GNU/Linux $DEBVERSION \"$CAPCODENAME\" - $OFFICIAL $ARCHES $DISKTYPE Binary-$DISKNUM $BUILD_DATE"
 			case "$ARCHES" in
 			    powerpc)
-				export VOLID="$VOLID_BASE ppc Bin-$DISKNUM" ;;
+				export VOLID="$VOLID_BASE ppc $DISKNUM" ;;
 			    kfreebsd-i386)
-				export VOLID="$VOLID_BASE f-i386 Bin-$DISKNUM" ;;
+				export VOLID="$VOLID_BASE f-i386 $DISKNUM" ;;
 			    kfreebsd-amd64)
-				export VOLID="$VOLID_BASE f-amd64 Bin-$DISKNUM" ;;
+				export VOLID="$VOLID_BASE f-amd64 $DISKNUM" ;;
 			    *)
-				export VOLID="$VOLID_BASE $ARCHES Bin-$DISKNUM" ;;
+				export VOLID="$VOLID_BASE $ARCHES $DISKNUM" ;;
 			esac
 			;;
 	esac