From owner-freebsd-stable@FreeBSD.ORG Sat Jan 7 00:35:37 2006 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5DED516A41F for ; Sat, 7 Jan 2006 00:35:37 +0000 (GMT) (envelope-from marius.nuennerich@gmx.net) Received: from mail.gmx.net (mail.gmx.de [213.165.64.21]) by mx1.FreeBSD.org (Postfix) with SMTP id 8C19043D45 for ; Sat, 7 Jan 2006 00:35:36 +0000 (GMT) (envelope-from marius.nuennerich@gmx.net) Received: (qmail invoked by alias); 07 Jan 2006 00:35:35 -0000 Received: from p5083C665.dip0.t-ipconnect.de (EHLO sol) [80.131.198.101] by mail.gmx.net (mp035) with SMTP; 07 Jan 2006 01:35:35 +0100 X-Authenticated: #5707313 Date: Sat, 7 Jan 2006 01:35:34 +0100 From: Marius Nuennerich To: Ceri Davies Message-ID: <20060107013534.6b1ebdab@sol> In-Reply-To: <20060106151441.GE86645@submonkey.net> References: <20060105134133.61aef78f@sol> <20060106151441.GE86645@submonkey.net> X-Mailer: Sylpheed-Claws 1.9.100 (GTK+ 2.8.9; i386-portbld-freebsd5.4) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Y-GMX-Trusted: 0 Cc: freebsd-stable@freebsd.org Subject: Re: /boot/nextboot.conf not deactivated after one boot X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Jan 2006 00:35:37 -0000 On Fri, 6 Jan 2006 15:14:41 +0000 Ceri Davies wrote: > On Thu, Jan 05, 2006 at 01:41:33PM +0100, Marius Nuennerich wrote: > > Hi folks, > > > > it seems like /boot/nextboot.conf is neither deleted nor > > nextboot_enable set to NO on the first line after a reboot. > > So it isn't a one shot anymore as the manpage claims. > > > > System is 6.0-RELEASE. > > I think this is down to a typo in /etc/rc.d/root; at least I can't find > any other reference to /boot/nextkernel in src/. Patch attached > (root.diff). > > > It would also be fine imo, if the -k option would be optional and the > > next kernel defaults to "kernel". > > I'm not sure if getopts can be persuaded to take an optional argument to > an option. If not, the attached patch (nextboot.diff) should work for > you. I tested both patches and they work as they should. Please commit :) Thanks Marius