From 8ab1d6933c2c4960b7e688dfdc31f1b31f225d37 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Wed, 3 May 2017 10:40:34 +0100
Subject: [PATCH] Drop ancient references to NONUS

---
 tools/boot/stretch/boot-alpha   | 10 ++--------
 tools/boot/stretch/boot-arm     |  4 ----
 tools/boot/stretch/boot-arm64   |  7 -------
 tools/boot/stretch/boot-hppa    |  2 +-
 tools/boot/stretch/boot-ia64    |  2 +-
 tools/boot/stretch/boot-mips    |  2 +-
 tools/boot/stretch/boot-mipsel  |  5 -----
 tools/boot/stretch/boot-s390x   |  2 +-
 tools/boot/stretch/boot-sparc   |  2 +-
 tools/boot/stretch/boot-sparc64 |  2 +-
 tools/boot/stretch/boot-x86     |  7 -------
 11 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/tools/boot/stretch/boot-alpha b/tools/boot/stretch/boot-alpha
index 3a0fa31f..16440fd3 100755
--- a/tools/boot/stretch/boot-alpha
+++ b/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
 
diff --git a/tools/boot/stretch/boot-arm b/tools/boot/stretch/boot-arm
index 34383b90..f1a86265 100755
--- a/tools/boot/stretch/boot-arm
+++ b/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
 
diff --git a/tools/boot/stretch/boot-arm64 b/tools/boot/stretch/boot-arm64
index e77f4ec9..61db9f63 100755
--- a/tools/boot/stretch/boot-arm64
+++ b/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
 
diff --git a/tools/boot/stretch/boot-hppa b/tools/boot/stretch/boot-hppa
index e563c6dc..a99755f7 100755
--- a/tools/boot/stretch/boot-hppa
+++ b/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
 
diff --git a/tools/boot/stretch/boot-ia64 b/tools/boot/stretch/boot-ia64
index cd72787c..3c6afe83 100755
--- a/tools/boot/stretch/boot-ia64
+++ b/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
diff --git a/tools/boot/stretch/boot-mips b/tools/boot/stretch/boot-mips
index f77d6bd4..d3f631b0 100755
--- a/tools/boot/stretch/boot-mips
+++ b/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
 
diff --git a/tools/boot/stretch/boot-mipsel b/tools/boot/stretch/boot-mipsel
index a3cc428d..2bc44267 100755
--- a/tools/boot/stretch/boot-mipsel
+++ b/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"
diff --git a/tools/boot/stretch/boot-s390x b/tools/boot/stretch/boot-s390x
index bc4b6d11..83bfe95f 100755
--- a/tools/boot/stretch/boot-s390x
+++ b/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
diff --git a/tools/boot/stretch/boot-sparc b/tools/boot/stretch/boot-sparc
index a1b62937..e06879d5 100755
--- a/tools/boot/stretch/boot-sparc
+++ b/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
 
diff --git a/tools/boot/stretch/boot-sparc64 b/tools/boot/stretch/boot-sparc64
index 14740e3f..c74d09c0 100755
--- a/tools/boot/stretch/boot-sparc64
+++ b/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
 
diff --git a/tools/boot/stretch/boot-x86 b/tools/boot/stretch/boot-x86
index 773efc2e..1d60889f 100644
--- a/tools/boot/stretch/boot-x86
+++ b/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