From owner-cvs-src@FreeBSD.ORG Mon Jan 16 10:10:15 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 3344016A41F; Mon, 16 Jan 2006 10:10:15 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E5CF43D45; Mon, 16 Jan 2006 10:10:13 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (rocky.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k0GAAB16023398; Mon, 16 Jan 2006 12:10:11 +0200 (EET) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ip.net.ua [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 49189-02-5; Mon, 16 Jan 2006 12:09:44 +0200 (EET) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id k0GA5VXs023245 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 16 Jan 2006 12:05:31 +0200 (EET) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.4/8.13.4) id k0GA5ZLU077922; Mon, 16 Jan 2006 12:05:35 +0200 (EET) (envelope-from ru) Date: Mon, 16 Jan 2006 12:05:35 +0200 From: Ruslan Ermilov To: Ceri Davies , src-committers@freebsd.org, cvs-src@freebsd.org, cvs-all@freebsd.org Message-ID: <20060116100535.GF81316@ip.net.ua> References: <200601152312.k0FNCQOw028323@repoman.freebsd.org> <20060116082403.GC81316@ip.net.ua> <20060116092829.GJ53724@submonkey.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="QXO0/MSS4VvK6f+D" Content-Disposition: inline In-Reply-To: <20060116092829.GJ53724@submonkey.net> User-Agent: Mutt/1.5.9i X-Virus-Scanned: by amavisd-new at ip.net.ua Cc: 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 10:10:15 -0000 --QXO0/MSS4VvK6f+D Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 opti= ons > > > 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. > > > =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"? Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --QXO0/MSS4VvK6f+D Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFDy2/vqRfpzJluFF4RApWYAJwNDuTHCZ4jic2p1z/nHRPv1M+GwQCfVZkJ Bbs3/1YpN/SmW+UKPxbPWaw= =MleJ -----END PGP SIGNATURE----- --QXO0/MSS4VvK6f+D--