From owner-cvs-src@FreeBSD.ORG Sun Jan 15 23:12:28 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 4611C16A41F; Sun, 15 Jan 2006 23:12:28 +0000 (GMT) (envelope-from ceri@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FB6843D62; Sun, 15 Jan 2006 23:12:26 +0000 (GMT) (envelope-from ceri@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0FNCQdq028324; Sun, 15 Jan 2006 23:12:26 GMT (envelope-from ceri@repoman.freebsd.org) Received: (from ceri@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0FNCQOw028323; Sun, 15 Jan 2006 23:12:26 GMT (envelope-from ceri) Message-Id: <200601152312.k0FNCQOw028323@repoman.freebsd.org> From: Ceri Davies Date: Sun, 15 Jan 2006 23:12:26 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: 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: Sun, 15 Jan 2006 23:12:28 -0000 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