Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Jan 2016 21:20:47 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r293227 - head/etc
Message-ID:  <201601052120.u05LKlQw074919@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Tue Jan  5 21:20:47 2016
New Revision: 293227
URL: https://svnweb.freebsd.org/changeset/base/293227

Log:
  Use the more proper -f. Leave /bin/rm in place since that's what
  other rc scripts have, though it isn't strictly necessary.

Modified:
  head/etc/rc

Modified: head/etc/rc
==============================================================================
--- head/etc/rc	Tue Jan  5 21:20:46 2016	(r293226)
+++ head/etc/rc	Tue Jan  5 21:20:47 2016	(r293227)
@@ -132,9 +132,9 @@ done
 # Remove the firstboot sentinel, and reboot if it was requested.
 if [ -e ${firstboot_sentinel} ]; then
 	[ ${root_rw_mount} = "yes" ] || mount -uw /
-	/bin/rm ${firstboot_sentinel}
+	/bin/rm -f ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
-		/bin/rm ${firstboot_sentinel}-reboot
+		/bin/rm -f ${firstboot_sentinel}-reboot
 		[ ${root_rw_mount} = "yes" ] || mount -ur /
 		kill -INT 1
 	fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601052120.u05LKlQw074919>