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 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
