Date: Mon, 16 Jan 2006 09:28:29 +0000 From: Ceri Davies <ceri@submonkey.net> To: Ruslan Ermilov <ru@freebsd.org> Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/etc/rc.d root Message-ID: <20060116092829.GJ53724@submonkey.net> In-Reply-To: <20060116082403.GC81316@ip.net.ua> References: <200601152312.k0FNCQOw028323@repoman.freebsd.org> <20060116082403.GC81316@ip.net.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Mon, Jan 16, 2006 at 10:24:03AM +0200, Ruslan Ermilov wrote:
> On Sun, Jan 15, 2006 at 11:12:26PM +0000, Ceri Davies wrote:
> > ceri 2006-01-15 23:12:26 UTC
> >
> > FreeBSD src repository
> >
> > Modified files:
> > etc/rc.d root
> > Log:
> > Marius Nuennerich pointed out that nextboot(8) configured boot options
> > were now sticky. This script was deleting /boot/nextkernel on boot, but
> > there is no code in the tree that creates that file since revision 1.15
> > of src/sbin/reboot/reboot.c.
> > nextboot(8) creates /boot/nextboot.conf, so remove that instead.
> >
> > Approved by: jhb (proxy mentor)
> > MFC after: 1 week
> >
> > Revision Changes Path
> > 1.12 +2 -2 src/etc/rc.d/root
> >
> It wasn't sticky -- /boot/support.4th overwrites /boot/nextboot.conf
> with ``nextboot_enable="NO"''. After boot:
>
> $ cat /boot/nextboot.conf
> nextboot_enable="NO"
> kernel="kernel"
> kernel_options=""
I saw that too. The report I had was that it wasn't doing that however,
which is a question for another day. The patch is correct despite this,
I believe.
Ceri
--
That must be wonderful! I don't understand it at all.
-- Alice
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFDy2c9ocfcwTS3JF8RAoZHAKCknPX+FMd6Ox4Z5Khg1MSaqIqg+wCfSXbI
pFCrEdNqK/+0ERySTaMSLBw=
=kRId
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060116092829.GJ53724>