From 4a2a622525930d4cccb1ddec410f4fb756a7afe3 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Thu, 21 Dec 2006 16:05:32 +0000
Subject: [PATCH] Make the boot scripts more consistent in how they call
 add_mkisofs_opt

---
 tools/boot/etch/boot-alpha   | 16 ++++++++--------
 tools/boot/etch/boot-amd64   | 17 ++++++++---------
 tools/boot/etch/boot-arm     |  2 +-
 tools/boot/etch/boot-i386    | 31 +++++++++++++++----------------
 tools/boot/etch/boot-ia64    | 12 ++++++------
 tools/boot/etch/boot-m68k    | 18 +++++++++---------
 tools/boot/etch/boot-mips    |  6 +++---
 tools/boot/etch/boot-mipsel  |  4 ++--
 tools/boot/etch/boot-powerpc | 22 +++++++++++-----------
 tools/boot/etch/boot-s390    |  6 +++---
 tools/boot/etch/boot-sparc   |  4 ++--
 11 files changed, 68 insertions(+), 70 deletions(-)

diff --git a/tools/boot/etch/boot-alpha b/tools/boot/etch/boot-alpha
index 2f1e75f1..7b9ff5f3 100755
--- a/tools/boot/etch/boot-alpha
+++ b/tools/boot/etch/boot-alpha
@@ -85,17 +85,17 @@ EOF
 
     mkdir -p boot$N/milo
 
-	add_mkisofs_opt $N.mkisofs_opts "-J"
-	add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
-	add_mkisofs_opt $N.mkisofs_opts "-l"
-	add_mkisofs_opt $N.mkisofs_opts "-alpha-boot boot/bootlx"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-alpha-boot boot/bootlx"
 
-	add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 
 else
-	add_mkisofs_opt $N.mkisofs_opts "-J"
-	add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
-	add_mkisofs_opt $N.mkisofs_opts "-l"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-l"
 fi
 
 #install_languages $CDDIR
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index e1cffab4..d5d4b45a 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -71,13 +71,13 @@ mkdir -p boot$N/isolinux boot$N/isolinux-amd64 $CDDIR/install.amd
 cp -lf cdrom/vmlinuz $CDDIR/install.amd/
 cp -lf cdrom/initrd.gz $CDDIR/install.amd/
 
-add_mkisofs_opt $N.mkisofs_opts "-J"
-add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
-add_mkisofs_opt $N.mkisofs_opts "-b isolinux/isolinux.bin"
-add_mkisofs_opt $N.mkisofs_opts "-c isolinux/boot.cat"
-add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
-add_mkisofs_opt $N.mkisofs_opts "-boot-load-size 4"
-add_mkisofs_opt $N.mkisofs_opts "-boot-info-table"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b isolinux/isolinux.bin"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c isolinux/boot.cat"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"
 
 syslinux_files () {
 	type=$1
@@ -184,7 +184,6 @@ EOF
 EOF
 fi
 
-# write final lines to mkisofs_opts
-add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 
 # th,th, thats all
diff --git a/tools/boot/etch/boot-arm b/tools/boot/etch/boot-arm
index b023c7ea..fc9c1c4d 100755
--- a/tools/boot/etch/boot-arm
+++ b/tools/boot/etch/boot-arm
@@ -31,7 +31,7 @@ fi
 
 cd $CDDIR/..
 
-add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 
 # Only disk 1* bootable
 if [ $N != 1 ] && [ $N != 1_NONUS ]; then
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index dc335e98..734da6dc 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -102,26 +102,26 @@ if [ "$NN" = "1" ]; then
     cp -lf cdrom/vmlinuz $CDDIR/install.386/
     cp -lf cdrom/initrd.gz $CDDIR/install.386/
 
-	add_mkisofs_opt $N.mkisofs_opts "-J"
-	add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
-	add_mkisofs_opt $N.mkisofs_opts "-b isolinux/isolinux.bin"
-	add_mkisofs_opt $N.mkisofs_opts "-c isolinux/boot.cat"
-	add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
-	add_mkisofs_opt $N.mkisofs_opts "-boot-load-size 4"
-	add_mkisofs_opt $N.mkisofs_opts "-boot-info-table"	
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b isolinux/isolinux.bin"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c isolinux/boot.cat"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-load-size 4"
+	add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-boot-info-table"	
 else
     if [ -n "$THISTYPE" ]; then
 		echo "      Using $THISTYPE boot-disks image on CD$N"
 		mkdir -p boot$N/boot
 		cp $THISTYPE/boot.img boot$N/boot/
 
-		add_mkisofs_opt $N.mkisofs_opts "-J"
-		add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
-		add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.img"
+		add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+		add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
+		add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.img"
     else
 		mkdir boot$N
-		add_mkisofs_opt $N.mkisofs_opts "-J"
-		add_mkisofs_opt $N.mkisofs_opts "-cache-inodes"
+		add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+		add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-cache-inodes"
     fi
 fi
 
@@ -254,13 +254,12 @@ EOF
 EOF
 fi
 
-# write final lines to mkisofs_opts
 if [ "$NN" = "1" ]; then
-    add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 else
 	if [ -n "$THISTYPE" ]; then
-        add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
-        add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+        add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
+        add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 	fi
 fi
 
diff --git a/tools/boot/etch/boot-ia64 b/tools/boot/etch/boot-ia64
index 83db0ab0..7ccddda6 100755
--- a/tools/boot/etch/boot-ia64
+++ b/tools/boot/etch/boot-ia64
@@ -28,7 +28,7 @@ cd $CDDIR/..
 
 # Only disc 1 bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then 
-    add_mkisofs_opt $N.mkisofs_opts "-J"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 	exit 0; 
 fi
 
@@ -53,12 +53,12 @@ install_languages $CDDIR
 mkdir -p boot$N/boot
 cp -f boot.img boot$N/boot/
 
-add_mkisofs_opt $N.mkisofs_opts "-J"
-add_mkisofs_opt $N.mkisofs_opts "-no-emul-boot"
-add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.img"
-add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-emul-boot"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.img"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
 
-add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
 
 # done
 
diff --git a/tools/boot/etch/boot-m68k b/tools/boot/etch/boot-m68k
index feb370ff..6898c699 100755
--- a/tools/boot/etch/boot-m68k
+++ b/tools/boot/etch/boot-m68k
@@ -32,12 +32,12 @@ cd $CDDIR/..
 # Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas
 # MAXDISKBLOCKS is measured in 2K blocks
 newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc`
-add_mkisofs_opt $N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
-add_mkisofs_opt $N.mkisofs_opts "-J"
-add_mkisofs_opt $N.mkisofs_opts "--netatalk"
-add_mkisofs_opt $N.mkisofs_opts "-hfs"
-add_mkisofs_opt $N.mkisofs_opts "-probe"
-add_mkisofs_opt $N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
 
 # Only disk 1 bootable
 if [ $N != 1 ]; then
@@ -90,9 +90,9 @@ cd $INSTALLDIR
 if [ -f tools/cdrom/bvme6000-boot.img.gz ]; then
 	mkdir -p $CDDIR/boot1/boot
 	cp tools/cdrom/bvme6000-boot.img.gz $CDDIR/boot1/boot/boot.bin
-    add_mkisofs_opt $N.mkisofs_opts "-b boot/boot.bin"
-    add_mkisofs_opt $N.mkisofs_opts "-c boot/boot.catalog"
-    add_mkisofs_opt $N.mkisofs_dirs "boot1"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-b boot/boot.bin"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-c boot/boot.catalog"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot1"
 fi
 
 ##-----------------------------< end of file >------------------------------##
diff --git a/tools/boot/etch/boot-mips b/tools/boot/etch/boot-mips
index 78f40629..a0da2821 100755
--- a/tools/boot/etch/boot-mips
+++ b/tools/boot/etch/boot-mips
@@ -24,7 +24,7 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J"
 
 # Only disk 1* bootable
 if [ $N != 1 -a $N != 1_NONUS ]; then
@@ -47,8 +47,8 @@ install -m 644 -D "$DI_DIR"/r4k-ip22/cdrom-boot.img "$CDROOT"/install/r4k-ip22-b
 
 install_languages $CDROOT
 
-add_mkisofs_opt $N.mkisofs_opts "-mips-boot install/r4k-ip22-boot.img"
+add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-mips-boot install/r4k-ip22-boot.img"
 #r5k-ip32 has no cdrom boot image yet
-#echo " -mips-boot install/r5k-ip32-boot.img" >> $1.mkisofs_opts
+#add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-mips-boot install/r5k-ip32-boot.img"
 
 exit 0
diff --git a/tools/boot/etch/boot-mipsel b/tools/boot/etch/boot-mipsel
index 3514137a..34621712 100755
--- a/tools/boot/etch/boot-mipsel
+++ b/tools/boot/etch/boot-mipsel
@@ -39,7 +39,7 @@ NN=`echo $N | sed -e 's/_NONUS//'`
 
 cd $CDROOT/..
 
-add_mkisofs_opt $N.mkisofs_opts "-J"
+add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-J"
 
 # Only disks 1 bootable
 if [ $NN != 1 ]; then
@@ -71,6 +71,6 @@ cp "$DI_DIR"/vmlinux-*-r4k-kn04 "$CDROOT/boot/vmlinux-r4k-kn04"
 
 install_languages $CDROOT
 
-add_mkisofs_opt $N.mkisofs_opts "-mipsel-boot boot/delo.2nd"
+add_mkisofs_opt $CDROOT/../$N.mkisofs_opts "-mipsel-boot boot/delo.2nd"
 
 exit 0
diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc
index 2e1c2f40..8bce9d0e 100755
--- a/tools/boot/etch/boot-powerpc
+++ b/tools/boot/etch/boot-powerpc
@@ -29,28 +29,28 @@ cd $CDDIR/..
 
 install_languages $CDDIR
 
-add_mkisofs_opt $N.mkisofs_opts "--iso-level 2"
-add_mkisofs_opt $N.mkisofs_opts "--netatalk"
-add_mkisofs_opt $N.mkisofs_opts "-hfs"
-add_mkisofs_opt $N.mkisofs_opts "-probe"
-add_mkisofs_opt $N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 2"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map"
 
 # Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas
 # MAXDISKBLOCKS is measured in 2K blocks
 newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc`
-add_mkisofs_opt $N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize"
 
 # Only disk 1* bootable
 if [ $N != 1 ] ; then
 	exit 0
 fi
 
-add_mkisofs_opt $N.mkisofs_opts "--chrp-boot"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--chrp-boot"
 # For newworld Mac booting  - Note, no spaces in volid!
-add_mkisofs_opt $N.mkisofs_opts "-part"
-add_mkisofs_opt $N.mkisofs_opts "-no-desktop"
-add_mkisofs_opt $N.mkisofs_opts "-hfs-bless CD$N/install"
-add_mkisofs_opt $N.mkisofs_opts "-hfs-volid Debian/PowerPC_${CODENAME}"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-part"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-no-desktop"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-bless CD$N/install"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-volid Debian/PowerPC_${CODENAME}"
 
 cd $INSTALLDIR
 # Extract yaboot from the archive
diff --git a/tools/boot/etch/boot-s390 b/tools/boot/etch/boot-s390
index f9ee2bb6..430be1fb 100755
--- a/tools/boot/etch/boot-s390
+++ b/tools/boot/etch/boot-s390
@@ -25,7 +25,7 @@ CDDIR=$2
 cd $CDDIR/..
 
 if [ $N != "1" ] && [ $N != "1_NONUS" ] ; then
-    add_mkisofs_opt $N.mkisofs_opts "-J"
+    add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
 	exit 0
 fi
 
@@ -91,5 +91,5 @@ cp $BASEDIR/data/$CODENAME/s390/d390* "$imagedir/"
 cp $BASEDIR/data/$CODENAME/s390/README.boot "boot$N/"
 
 # Include the boot$N/-tree into the iso-image
-add_mkisofs_opt $N.mkisofs_opts "-J"
-add_mkisofs_opt $N.mkisofs_dirs "boot$N"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot$N"
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index d936588a..16eee2bf 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -28,8 +28,8 @@ fi
 
 install_languages $CDDIR
 
-add_mkisofs_opt $N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
-add_mkisofs_opt $N.mkisofs_dirs "boot1"
+add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-G boot1/boot/isofs.b -B ..."
+add_mkisofs_opt $CDDIR/../$N.mkisofs_dirs "boot1"
 
 inst=boot1