From owner-cvs-all@FreeBSD.ORG  Mon Jan 16 08:28:48 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C46CD16A41F;
	Mon, 16 Jan 2006 08:28:48 +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 B869743D46;
	Mon, 16 Jan 2006 08:28:47 +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 k0G8SjmC019418;
	Mon, 16 Jan 2006 10:28:45 +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 48048-02-2; Mon, 16 Jan 2006 10:28:18 +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 k0G8O4hL019288
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 16 Jan 2006 10:24:04 +0200 (EET) (envelope-from ru@ip.net.ua)
Received: (from ru@localhost)
	by heffalump.ip.net.ua (8.13.4/8.13.4) id k0G8O9v7077350;
	Mon, 16 Jan 2006 10:24:09 +0200 (EET) (envelope-from ru)
Date: Mon, 16 Jan 2006 10:24:03 +0200
From: Ruslan Ermilov <ru@freebsd.org>
To: Ceri Davies <ceri@freebsd.org>
Message-ID: <20060116082403.GC81316@ip.net.ua>
References: <200601152312.k0FNCQOw028323@repoman.freebsd.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="eRtJSFbw+EEWtPj3"
Content-Disposition: inline
In-Reply-To: <200601152312.k0FNCQOw028323@repoman.freebsd.org>
User-Agent: Mutt/1.5.9i
X-Virus-Scanned: by amavisd-new at ip.net.ua
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-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2006 08:28:48 -0000


--eRtJSFbw+EEWtPj3
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 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.
>  =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:

$ cat /boot/nextboot.conf=20
nextboot_enable=3D"NO"=20
kernel=3D"kernel"
kernel_options=3D""


Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer

--eRtJSFbw+EEWtPj3
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)

iD8DBQFDy1gjqRfpzJluFF4RAuKOAJ4jLaIZ60eYkdGMV6js+4s8bvjgvgCfc+8W
4+/4ihpZN7i91dHJZbtV034=
=n2fO
-----END PGP SIGNATURE-----

--eRtJSFbw+EEWtPj3--