From owner-svn-src-head@freebsd.org  Wed Jan  6 00:00:08 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A895A63C6D
 for <svn-src-head@mailman.ysv.freebsd.org>;
 Wed,  6 Jan 2016 00:00:08 +0000 (UTC) (envelope-from ian@freebsd.org)
Received: from pmta2.delivery6.ore.mailhop.org
 (pmta2.delivery6.ore.mailhop.org [54.200.129.228])
 (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 1DBD810B1
 for <svn-src-head@freebsd.org>; Wed,  6 Jan 2016 00:00:07 +0000 (UTC)
 (envelope-from ian@freebsd.org)
Received: from ilsoft.org (unknown [73.34.117.227])
 by outbound2.ore.mailhop.org (Halon Mail Gateway) with ESMTPSA;
 Wed,  6 Jan 2016 00:00:39 +0000 (UTC)
Received: from rev (rev [172.22.42.240])
 by ilsoft.org (8.14.9/8.14.9) with ESMTP id u06004SN002360;
 Tue, 5 Jan 2016 17:00:04 -0700 (MST) (envelope-from ian@freebsd.org)
Message-ID: <1452038404.1320.46.camel@freebsd.org>
Subject: Re: svn commit: r293227 - head/etc
From: Ian Lepore <ian@freebsd.org>
To: Warner Losh <imp@FreeBSD.org>, src-committers@freebsd.org,
 svn-src-all@freebsd.org, svn-src-head@freebsd.org
Date: Tue, 05 Jan 2016 17:00:04 -0700
In-Reply-To: <201601052120.u05LKlQw074919@repo.freebsd.org>
References: <201601052120.u05LKlQw074919@repo.freebsd.org>
Content-Type: text/plain; charset="us-ascii"
X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Jan 2016 00:00:08 -0000

On Tue, 2016-01-05 at 21:20 +0000, Warner Losh wrote:
> 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
> 

Using rm -f to suppress an error message seems like a bad idea here --
if the sentinel file can't be removed that implies it's going to do
firstboot behavior every time it boots, and that's the sort of error
that should be in-your-face.  Especially on the reboot one because
you're going to be stuck in a reboot loop with no error message.

-- Ian