From owner-svn-src-head@freebsd.org Wed Jan 6 00:16:54 2016 Return-Path: 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 97F40A6331B; Wed, 6 Jan 2016 00:16:54 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 897951C4A; Wed, 6 Jan 2016 00:16:54 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from 50-196-156-133-static.hfc.comcastbusiness.net ([50.196.156.133]:63311 helo=tinkerbell.pixel8networks.com) by shxd.cx with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1aGTT9-000LYO-6w; Tue, 05 Jan 2016 07:24:19 -0800 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\)) Subject: Re: svn commit: r293227 - head/etc From: Devin Teske In-Reply-To: <1452038404.1320.46.camel@freebsd.org> Date: Tue, 5 Jan 2016 16:16:49 -0800 Cc: Warner Losh , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, Devin Teske Content-Transfer-Encoding: 7bit Message-Id: <1A1BB09D-2FB4-4E50-9F86-62B772855224@freebsd.org> References: <201601052120.u05LKlQw074919@repo.freebsd.org> <1452038404.1320.46.camel@freebsd.org> To: Ian Lepore X-Mailer: Apple Mail (2.2104) Sender: devin@shxd.cx 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2016 00:16:54 -0000 > On Jan 5, 2016, at 4:00 PM, Ian Lepore wrote: > > 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. > Leaving off -f so that the user gets prompted isn't quite as helpful as, say, using -f but then testing to make sure the file is really gone (if it still exists after a silent "rm -f", put up an informative warning instead of asking the user if they would like to delete it). The end-result of having something thrown in your face seems desirable. Having a prompt that asks you if you'd like to delete it (even if there is an error immediately above it explaining it could not be deleted) seems nonsensical. -- Devin