svn commit: r245177 - in head/release: amd64 i386 ia64 pc98 powerpc sparc64

[Hiroki Sato]

Author: hrs
Date: Tue Jan  8 21:13:58 2013
New Revision: 245177
URL: http://svnweb.freebsd.org/changeset/base/245177

Log:
  ISO 9660 specification allows only "d-characters" and "a-characters" in the
  Volume Descriptor (section 7.4).  In short, upper-case alphanumeric + some
  symbols only.  While the makefs utility automatically converts the characters,
  $LABEL should be consistent in the scripts.

Modified:
  head/release/amd64/mkisoimages.sh
  head/release/i386/mkisoimages.sh
  head/release/ia64/mkisoimages.sh
  head/release/pc98/mkisoimages.sh
  head/release/powerpc/mkisoimages.sh
  head/release/sparc64/mkisoimages.sh

Modified: head/release/amd64/mkisoimages.sh
==============================================================================
--- head/release/amd64/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/amd64/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: head/release/i386/mkisoimages.sh
==============================================================================
--- head/release/i386/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/i386/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: head/release/ia64/mkisoimages.sh
==============================================================================
--- head/release/ia64/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/ia64/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -37,7 +37,7 @@ if [ $# -lt 3 ]; then
     exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 BASE=$1; shift
 

Modified: head/release/pc98/mkisoimages.sh
==============================================================================
--- head/release/pc98/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/pc98/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: head/release/powerpc/mkisoimages.sh
==============================================================================
--- head/release/powerpc/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/powerpc/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -58,10 +58,10 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab
 rm /tmp/hfs-boot-block

Modified: head/release/sparc64/mkisoimages.sh
==============================================================================
--- head/release/sparc64/mkisoimages.sh	Tue Jan  8 20:49:43 2013	(r245176)
+++ head/release/sparc64/mkisoimages.sh	Tue Jan  8 21:13:58 2013	(r245177)
@@ -63,7 +63,7 @@ if [ $? -ne 0 ]; then
 	fi
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab