From owner-svn-src-projects@FreeBSD.ORG Tue Feb 10 13:34:48 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC6201FF; Tue, 10 Feb 2015 13:34:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6DB9E1A; Tue, 10 Feb 2015 13:34:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1ADYl55005064; Tue, 10 Feb 2015 13:34:47 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1ADYkSi005054; Tue, 10 Feb 2015 13:34:46 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201502101334.t1ADYkSi005054@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 10 Feb 2015 13:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278512 - in projects/release-install-debug/release: amd64 i386 pc98 powerpc sparc64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Feb 2015 13:34:48 -0000 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}