Index: projects/release-install-debug/release/amd64/mkisoimages.sh
===================================================================
--- projects/release-install-debug/release/amd64/mkisoimages.sh	(revision 278511)
+++ projects/release-install-debug/release/amd64/mkisoimages.sh	(revision 278512)
@@ -1,60 +1,60 @@
 #!/bin/sh
 #
 # Module: mkisoimages.sh
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
 # $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
 # platform has a slightly unique way of making bootable CDs.  This script
 # is also allowed to generate any number of images since that is more of
 # publishing decision than anything else.
 #
 # Usage:
 #
 # mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
 #
 # Where -b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
 
 	# Make EFI system partition (should be done with makefs in the future)
 	dd if=/dev/zero of=efiboot.img bs=4k count=100
 	device=`mdconfig -a -t vnode -f efiboot.img`
 	newfs_msdos -F 12 -m 0xf8 /dev/$device
 	mkdir efi
 	mount -t msdosfs /dev/$device efi
 	mkdir -p efi/efi/boot
 	cp ${4}/boot/loader.efi efi/efi/boot/bootx64.efi
 	umount efi
 	rmdir efi
 	mdconfig -d -u $device
 	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
 	
 	shift
 else
 	bootable=""
 fi
 
 if [ $# -lt 3 ]; then
 	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
 	exit 1
 fi
 
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
 rm -f efiboot.img
Index: projects/release-install-debug/release/i386/mkisoimages.sh
===================================================================
--- projects/release-install-debug/release/i386/mkisoimages.sh	(revision 278511)
+++ projects/release-install-debug/release/i386/mkisoimages.sh	(revision 278512)
@@ -1,45 +1,45 @@
 #!/bin/sh
 #
 # Module: mkisoimages.sh
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
 # $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
 # platform has a slightly unique way of making bootable CDs.  This script
 # is also allowed to generate any number of images since that is more of
 # publishing decision than anything else.
 #
 # Usage:
 #
 # mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
 #
 # Where -b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
 	shift
 else
 	bootable=""
 fi
 
 if [ $# -lt 3 ]; then
 	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
 	exit 1
 fi
 
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
Index: projects/release-install-debug/release/pc98/mkisoimages.sh
===================================================================
--- projects/release-install-debug/release/pc98/mkisoimages.sh	(revision 278511)
+++ projects/release-install-debug/release/pc98/mkisoimages.sh	(revision 278512)
@@ -1,45 +1,45 @@
 #!/bin/sh
 #
 # Module: mkisoimages.sh
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
 # $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
 # platform has a slightly unique way of making bootable CDs.  This script
 # is also allowed to generate any number of images since that is more of
 # publishing decision than anything else.
 #
 # Usage:
 #
 # mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
 #
 # Where -b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o generic-bootimage=$4/boot/cdboot"
 	shift
 else
 	bootable=""
 fi
 
 if [ $# -lt 3 ]; then
 	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
 	exit 1
 fi
 
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
+rm -f $1/etc/fstab
Index: projects/release-install-debug/release/powerpc/mkisoimages.sh
===================================================================
--- projects/release-install-debug/release/powerpc/mkisoimages.sh	(revision 278511)
+++ projects/release-install-debug/release/powerpc/mkisoimages.sh	(revision 278512)
@@ -1,69 +1,69 @@
 #!/bin/sh
 #
 # Module: mkisoimages.sh
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
 # $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
 # platform has a slightly unique way of making bootable CDs.  This script
 # is also allowed to generate any number of images since that is more of
 # publishing decision than anything else.
 #
 # Usage:
 #
 # mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
 #
 # Where -b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
 if [ "x$1" = "x-b" ]; then
 	# Apple boot code
 	uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
 	bzip2 -d /tmp/hfs-boot-block.bz2
 	OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
 	OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
 	dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
 
 	bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
 
 	# pSeries/PAPR boot code
 	mkdir -p $4/ppc/chrp
 	cp $4/boot/loader $4/ppc/chrp
 	cat > $4/ppc/bootinfo.txt << EOF
 <chrp-boot>
 <description>FreeBSD Install</description>
 <os-name>FreeBSD</os-name>
 <boot-script>boot &device;:,\ppc\chrp\loader</boot-script>
 </chrp-boot>
 EOF
 	bootable="$bootable -o chrp-boot"
 
 	# Playstation 3 boot code
 	echo "FreeBSD Install='/boot/loader.ps3'" > $4/etc/kboot.conf
 
 	shift
 else
 	bootable=""
 fi
 
 if [ $# -lt 3 ]; then
 	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
 	exit 1
 fi
 
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL -o publisher="$publisher" $NAME $*
-rm $1/etc/fstab
-rm /tmp/hfs-boot-block
+rm -f $1/etc/fstab
+rm -f /tmp/hfs-boot-block
 rm -rf $1/ppc
Index: projects/release-install-debug/release/sparc64/mkisoimages.sh
===================================================================
--- projects/release-install-debug/release/sparc64/mkisoimages.sh	(revision 278511)
+++ projects/release-install-debug/release/sparc64/mkisoimages.sh	(revision 278512)
@@ -1,84 +1,84 @@
 #!/bin/sh
 #
 # Module: mkisoimages.sh
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
 # $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
 # platform has a slightly unique way of making bootable CDs.  This script
 # is also allowed to generate any number of images since that is more of
 # publishing decision than anything else.
 #
 # Usage:
 #
 # mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
 #
 # Where -b is passed if the ISO image should be made "bootable" by
 # whatever standards this architecture supports (may be unsupported),
 # image-label is the ISO image label, image-name is the filename of the
 # resulting ISO image, base-bits-dir contains the image contents and
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 if [ $# -lt 3 ]; then
 	echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' > /dev/stderr
 	exit 1
 fi
 
 case $1 in
 -b)	BOPT=$1; shift ;;
 esac
 LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 BASEBITSDIR=$1
 
 # Create an ISO image
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "${BASEBITSDIR}/etc/fstab"
 makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" ${NAME}.tmp $*
-rm "${BASEBITSDIR}/etc/fstab"
+rm -f "${BASEBITSDIR}/etc/fstab"
 
 if [ "x$BOPT" != "x-b" ]; then
 	mv ${NAME}.tmp ${NAME}
 	exit 0
 fi
 
 TMPIMGDIR=`mktemp -d /tmp/bootfs.XXXXXXXX` || exit 1
 BOOTFSDIR="${TMPIMGDIR}/bootfs"
 BOOTFSIMG="${TMPIMGDIR}/bootfs.img"
 
 # Create a boot filesystem
 mkdir -p "${BOOTFSDIR}/boot"
 cp -p "${BASEBITSDIR}/boot/loader" "${BOOTFSDIR}/boot"
 makefs -t ffs -B be -M 512k "${BOOTFSIMG}" "${BOOTFSDIR}"
 dd if="${BASEBITSDIR}/boot/boot1" of="${BOOTFSIMG}" bs=512 conv=notrunc,sync
 
 # Create a boot ISO image
 : ${CYLSIZE:=640}
 ISOSIZE=$(stat -f %z ${NAME}.tmp)
 ISOBLKS=$(((${ISOSIZE} + 511) / 512))
 ISOCYLS=$(((${ISOBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE}))
 
 BOOTFSSIZE=$(stat -f %z "${BOOTFSIMG}")
 BOOTFSBLKS=$(((${BOOTFSSIZE} + 511) / 512))
 BOOTFSCYLS=$(((${BOOTFSBLKS} + (${CYLSIZE} - 1)) / ${CYLSIZE}))
 
 ENDCYL=$((${ISOCYLS} + ${BOOTFSCYLS}))
 NSECTS=$((${ENDCYL} * 1 * ${CYLSIZE}))
 
 dd if=${NAME}.tmp of=${NAME} bs=${CYLSIZE}b conv=notrunc,sync
 dd if=${BOOTFSIMG} of=${NAME} bs=${CYLSIZE}b seek=${ISOCYLS} conv=notrunc,sync
 # The number of alternative cylinders is always 2.
 dd if=/dev/zero of=${NAME} bs=${CYLSIZE}b seek=${ENDCYL} count=2 conv=notrunc,sync
 rm -rf ${NAME}.tmp ${TMPIMGDIR}
 
 # Write VTOC8 label to boot ISO image
 MD=`mdconfig -a -t vnode -S 512 -y 1 -x ${CYLSIZE} -f ${NAME}`
 gpart create -s VTOC8 ${MD}
 # !4: usr, for ISO image part
 gpart add -i 1 -s $((${ISOCYLS} * ${CYLSIZE} * 512))b -t \!4 ${MD}
 # !2: root, for bootfs part.
 gpart add -i 6 -s $((${BOOTFSCYLS} * ${CYLSIZE} * 512))b -t \!2 ${MD}
 mdconfig -d -u ${MD#md}