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.
Ceri
--
That must be wonderful! I don't understand it at all.
-- Alice
pgpfJvaSZkipe.pgp
Description: PGP signature
