Date: Sat, 8 Mar 2008 09:37:46 -0600 From: Brooks Davis <brooks@freebsd.org> To: d@delphij.net Cc: mtm@freebsd.org, freebsd-rc@freebsd.org Subject: Re: [RFC] Split nextboot deletion from /etc/rc.d/root Message-ID: <20080308153746.GB58790@lor.one-eyed-alien.net> In-Reply-To: <47D1DE64.20405@delphij.net> References: <47D1DE64.20405@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--ZoaI/ZTpAVc4A5k6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Mar 07, 2008 at 04:31:32PM -0800, Xin LI wrote: > Hi, >=20 > Here is a patch that moves the nextboot deletion from /etc/rc.d/root to a= =20 > new script which would be fired after mountlate. The reason behind this = is=20 > that /boot is not necessarily part of the /, and doing nextboot -D would= =20 > give an error if /boot is not mounted (i.e. in a typical setup of ZFS=20 > root). >=20 > Objections? This seems somewhat risky in that delaying removal of the nextboot file mea= ns crashes under moderate load (like running rc.d) will be harder to recover f= rom. What about doing it both places? -- Brooks > Cheers, > --=20 > Xin LI <delphij@delphij.net> http://www.delphij.net/ > FreeBSD - The Power to Serve! > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/ncvs/src/etc/rc.d/Makefile,v > retrieving revision 1.89 > diff -u -p -r1.89 Makefile > --- Makefile 5 Mar 2008 18:32:58 -0000 1.89 > +++ Makefile 8 Mar 2008 00:14:00 -0000 > @@ -23,7 +23,7 @@ FILES=3D DAEMON FILESYSTEMS LOGIN NETWORKI > mixer motd mountcritlocal mountcritremote mountlate \ > mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ > named natd netif netoptions \ > - network_ipv6 newsyslog nfsclient nfsd \ > + network_ipv6 newsyslog nextboot nfsclient nfsd \ > nfsserver nisdomain nsswitch ntpd ntpdate \ > othermta \ > pf pflog pfsync \ > Index: root > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/ncvs/src/etc/rc.d/root,v > retrieving revision 1.16 > diff -u -p -r1.16 root > --- root 8 Dec 2007 07:20:22 -0000 1.16 > +++ root 8 Mar 2008 00:13:42 -0000 > @@ -30,12 +30,6 @@ root_start() > esac > =20 > umount -a >/dev/null 2>&1 > - > - # If we booted a special kernel remove the record > - # so we will boot the default kernel next time. > - if [ -x /sbin/nextboot ]; then > - /sbin/nextboot -D > - fi > } > =20 > load_rc_config $name > Index: nextboot > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: nextboot > diff -N nextboot > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ nextboot 8 Mar 2008 00:14:21 -0000 > @@ -0,0 +1,26 @@ > +#!/bin/sh > +# > +# $FreeBSD$ > +# > + > +# PROVIDE: nextboot > +# REQUIRE: mountlate > +# KEYWORD: nojail > + > +. /etc/rc.subr > + > +name=3D"nextboot" > +start_cmd=3D"nextboot_start" > +stop_cmd=3D":" > + > +nextboot_start() > +{ > + # If we booted a special kernel remove the record > + # so we will boot the default kernel next time. > + if [ -x /sbin/nextboot ]; then > + /sbin/nextboot -D > + fi > +} > + > +load_rc_config $name > +run_rc_command "$1" > _______________________________________________ > freebsd-rc@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-rc > To unsubscribe, send any mail to "freebsd-rc-unsubscribe@freebsd.org" --ZoaI/ZTpAVc4A5k6 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (FreeBSD) iD8DBQFH0rLKXY6L6fI4GtQRAmNUAKCd4OuiB5/bLQMZMTi+T1zVZGINKQCgyZvo H4UNagZb61CJ6vBXj5UGKUo= =3WFX -----END PGP SIGNATURE----- --ZoaI/ZTpAVc4A5k6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080308153746.GB58790>