svn commit: r278512 - in projects/release-install-debug/release: amd64 i386 pc98 powerpc sparc64

[Glen Barber]

Author: gjb
Date: Tue Feb 10 13:34:45 2015
New Revision: 278512
URL: https://svnweb.freebsd.org/changeset/base/278512

Log:
  Avoid failure if unable to rm(1) files.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-install-debug/release/amd64/mkisoimages.sh
  projects/release-install-debug/release/i386/mkisoimages.sh
  projects/release-install-debug/release/pc98/mkisoimages.sh
  projects/release-install-debug/release/powerpc/mkisoimages.sh
  projects/release-install-debug/release/sparc64/mkisoimages.sh

Modified: projects/release-install-debug/release/amd64/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/amd64/mkisoimages.sh	Tue Feb 10 13:29:44 2015	(r278511)
+++ projects/release-install-debug/release/amd64/mkisoimages.sh	Tue Feb 10 13:34:45 2015	(r278512)
@@ -56,5 +56,5 @@ 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

Modified: projects/release-install-debug/release/i386/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/i386/mkisoimages.sh	Tue Feb 10 13:29:44 2015	(r278511)
+++ projects/release-install-debug/release/i386/mkisoimages.sh	Tue Feb 10 13:34:45 2015	(r278512)
@@ -42,4 +42,4 @@ 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

Modified: projects/release-install-debug/release/pc98/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/pc98/mkisoimages.sh	Tue Feb 10 13:29:44 2015	(r278511)
+++ projects/release-install-debug/release/pc98/mkisoimages.sh	Tue Feb 10 13:34:45 2015	(r278512)
@@ -42,4 +42,4 @@ 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

Modified: projects/release-install-debug/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/powerpc/mkisoimages.sh	Tue Feb 10 13:29:44 2015	(r278511)
+++ projects/release-install-debug/release/powerpc/mkisoimages.sh	Tue Feb 10 13:34:45 2015	(r278512)
@@ -64,6 +64,6 @@ 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

Modified: projects/release-install-debug/release/sparc64/mkisoimages.sh
==============================================================================
--- projects/release-install-debug/release/sparc64/mkisoimages.sh	Tue Feb 10 13:29:44 2015	(r278511)
+++ projects/release-install-debug/release/sparc64/mkisoimages.sh	Tue Feb 10 13:34:45 2015	(r278512)
@@ -38,7 +38,7 @@ BASEBITSDIR=$1
 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}