Date: Mon, 16 Jan 2006 07:45:36 -0800 From: Wes Peters <wes@softweyr.com> To: Ceri Davies <ceri@submonkey.net> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, Ruslan Ermilov <ru@FreeBSD.org>, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc/rc.d root Message-ID: <DFD8AFC9-DB3B-4CCA-99A2-7F7B0798A302@opensail.org> In-Reply-To: <20060116134244.GL53724@submonkey.net> References: <200601152312.k0FNCQOw028323@repoman.freebsd.org> <20060116082403.GC81316@ip.net.ua> <20060116092829.GJ53724@submonkey.net> <20060116100535.GF81316@ip.net.ua> <20060116134244.GL53724@submonkey.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Jan 16, 2006, at 5:42 AM, Ceri Davies wrote:
> On Mon, Jan 16, 2006 at 12:05:35PM +0200, Ruslan Ermilov wrote:
>> On Mon, Jan 16, 2006 at 09:28:29AM +0000, Ceri Davies wrote:
>>> 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.
>>>
>> I'm not happy with implementation either, maybe it should instead run
>> "nextboot -D"?
>
> That makes it dependent on /usr, which would be OK if this wasn't
> intended for test booting stuff. All I've done is correct a 4 year
> old
> oversight (nextkernel was renamed to nextboot.conf and this was
> missed).
> I'll leave any new implementation to someone else.
I'll stick my nose in here as the original implementer of this trivial
toy. nextboot.conf is only EVER needed as the result of running
nextboot,
so removing the file on any normal boot is an entirely reasonable thing
to do.
Ruslan, I like your idea of 'nextboot -D'. The nextboot utility is
written in /bin/sh and located in /sbin, so adding this feature won't
make
the program any bigger. I'll finish this little project today, unless
you've already done it.
--
Where am I, and what am I doing in this handbasket?
Wes Peters
wes@softweyr.com
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DFD8AFC9-DB3B-4CCA-99A2-7F7B0798A302>