Drop ancient references to NONUS

tools/boot/stretch/boot-alpha

@@ -34,13 +34,7 @@ cd $CDDIR/..
 
 #
 # This script is called with $1 (now $N) as the CD to 
-# make bootable.  N may be in the form "n" or "n_NONUS"
-# There may be more than 4 disks...support extras.
-
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-#
-NN=`echo $N | sed -e 's/_NONUS//'`
+# make bootable.
 
 # Common options for all disks
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
@@ -48,7 +42,7 @@ add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
 
 # Only disk 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then
+if [ $N != 1 ]; then
 	exit 0
 fi
 

tools/boot/stretch/boot-arm

@@ -37,10 +37,6 @@ cd $CDDIR/..
 
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-NN=`echo $N | sed -e 's/_NONUS//'`
-
 # Exit if this is not CD#1/DVD#1
 if [ $NN != 1 ] ; then exit 0; fi
 

tools/boot/stretch/boot-arm64

@@ -38,13 +38,6 @@ esac
 cd $CDDIR/..
 
 # This script is called with $1 (now $N) as the CD to make bootable.
-# N may be in the form "n" or "n_NONUS" There may be more than 4
-# disks...support extras.
-
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-NN=`echo $N | sed -e 's/_NONUS//'`
-
 # Exit if this is not a boot disk
 if [ $NN != 1 ] ; then exit 0; fi
 

tools/boot/stretch/boot-hppa

@@ -19,7 +19,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
 fi
 
 # Only disk 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then
+if [ $N != 1 ]; then
 	exit 0
 fi
 

tools/boot/stretch/boot-ia64

@@ -20,7 +20,7 @@ fi
 cd $CDDIR/..
 
 # Only disc 1 bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then 
+if [ $N != 1 ]; then 
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 	exit 0; 
 fi

tools/boot/stretch/boot-mips

@@ -22,7 +22,7 @@ fi
 add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
 
 # Only disk 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then
+if [ $N != 1 ]; then
 	exit 0
 fi
 

tools/boot/stretch/boot-mipsel

@@ -20,11 +20,6 @@ if [ "$DI_WWW_HOME" = "default" ];then
     try_di_image_cache
 fi
 
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-#
-NN=`echo $N | sed -e 's/_NONUS//'`
-
 cd $CDROOT/..
 
 add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J -joliet-long"

tools/boot/stretch/boot-s390x

@@ -26,7 +26,7 @@ CDDIR=$2
 
 cd $CDDIR/..
 
-if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
+if [ $N != "1" ] ; then
     add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long"
     exit 0
 fi

tools/boot/stretch/boot-sparc

@@ -16,7 +16,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
 fi
 
 # Only disc 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then 
+if [ $N != 1 ]; then 
 	exit 0; 
 fi
 

tools/boot/stretch/boot-sparc64

@@ -16,7 +16,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
 fi
 
 # Only disc 1* bootable
-if [ $N != 1 -a $N != 1_NONUS ]; then 
+if [ $N != 1 ]; then 
 	exit 0; 
 fi
 

tools/boot/stretch/boot-x86

@@ -65,13 +65,6 @@ esac
 cd $CDDIR/..
 
 # This script is called with $1 (now $N) as the CD to make bootable.
-# N may be in the form "n" or "n_NONUS" There may be more than 4
-# disks...support extras.
-
-# Strip NONUS part of disk number
-# NN will be 1...N so it can be used as an index
-NN=`echo $N | sed -e 's/_NONUS//'`
-
 # Exit if this is not a boot disk
 if [ $NN != 1 ] ; then exit 0; fi