From owner-cvs-src@FreeBSD.ORG Mon Jan 16 13:42:46 2006 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6851B16A41F; Mon, 16 Jan 2006 13:42:46 +0000 (GMT) (envelope-from ceri@submonkey.net) Received: from shrike.submonkey.net (cpc2-cdif2-3-1-cust208.cdif.cable.ntl.com [82.31.78.208]) by mx1.FreeBSD.org (Postfix) with ESMTP id C9DB943D45; Mon, 16 Jan 2006 13:42:45 +0000 (GMT) (envelope-from ceri@submonkey.net) Received: from ceri by shrike.submonkey.net with local (Exim 4.60 (FreeBSD)) (envelope-from ) id 1EyUdA-000LOG-Ip; Mon, 16 Jan 2006 13:42:44 +0000 Date: Mon, 16 Jan 2006 13:42:44 +0000 From: Ceri Davies To: Ruslan Ermilov Message-ID: <20060116134244.GL53724@submonkey.net> Mail-Followup-To: Ceri Davies , Ruslan Ermilov , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org References: <200601152312.k0FNCQOw028323@repoman.freebsd.org> <20060116082403.GC81316@ip.net.ua> <20060116092829.GJ53724@submonkey.net> <20060116100535.GF81316@ip.net.ua> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="citGix+cyBYE+lqp" Content-Disposition: inline In-Reply-To: <20060116100535.GF81316@ip.net.ua> X-PGP: finger ceri@FreeBSD.org User-Agent: Mutt/1.5.11 Sender: Ceri Davies Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/etc/rc.d root X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2006 13:42:46 -0000 --citGix+cyBYE+lqp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 > > > >=20 > > > > FreeBSD src repository > > > >=20 > > > > Modified files: > > > > etc/rc.d root=20 > > > > Log: > > > > Marius Nuennerich pointed out that nextboot(8) configured boot op= tions > > > > were now sticky. This script was deleting /boot/nextkernel on bo= ot, but > > > > there is no code in the tree that creates that file since revisio= n 1.15 > > > > of src/sbin/reboot/reboot.c. > > > > nextboot(8) creates /boot/nextboot.conf, so remove that instead. > > > > =20 > > > > Approved by: jhb (proxy mentor) > > > > MFC after: 1 week > > > > =20 > > > > Revision Changes Path > > > > 1.12 +2 -2 src/etc/rc.d/root > > > >=20 > > > It wasn't sticky -- /boot/support.4th overwrites /boot/nextboot.conf > > > with ``nextboot_enable=3D"NO"''. After boot: > > >=20 > > > $ cat /boot/nextboot.conf=20 > > > nextboot_enable=3D"NO"=20 > > > kernel=3D"kernel" > > > kernel_options=3D"" > >=20 > > 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. > >=20 > 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 --=20 That must be wonderful! I don't understand it at all. -- Alice --citGix+cyBYE+lqp Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDy6LUocfcwTS3JF8RAtwMAKCrwh1QCQkAFiqkXnVQfsvaCh3q4wCdFRA3 qm5geDc7m/ceVBHmWGQWAf4= =xk4A -----END PGP SIGNATURE----- --citGix+cyBYE+lqp--