From owner-cvs-all Sun Dec 22 14:18:43 2002 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 38A2337B40F; Sun, 22 Dec 2002 14:18:42 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E96D443EDC; Sun, 22 Dec 2002 14:18:41 -0800 (PST) (envelope-from dillon@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMMIffh074311; Sun, 22 Dec 2002 14:18:41 -0800 (PST) (envelope-from dillon@repoman.freebsd.org) Received: (from dillon@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMMIfIJ074310; Sun, 22 Dec 2002 14:18:41 -0800 (PST) Message-Id: <200212222218.gBMMIfIJ074310@repoman.freebsd.org> From: Matt Dillon Date: Sun, 22 Dec 2002 14:18:41 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/etc rc src/etc/rc.d devd diskless initdiskless rcconf X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG dillon 2002/12/22 14:18:41 PST Modified files: etc rc etc/rc.d devd diskless initdiskless Added files: etc/rc.d rcconf Log: Do not unconditionally load the configuration files for the RCNG case. Instead, load them as part of the rc.d system. This allows us to prioritize the initidiskless script so it runs before the configuration files are loaded and allows us to get rid of the exit 2 hack in /etc/rc. The exit 2 never worked anyway since it did not unset the prior configuration, causing the diskless code to not operate properly. Do a major cleanup and revamping of the diskless code for RCNG. This will be backported to the non-RCNG scripts as well as -stable. With suggestions from: Mike Makonnen MFC after: 7 days Revision Changes Path 1.325 +3 -11 src/etc/rc 1.3 +1 -0 src/etc/rc.d/devd 1.24 +77 -31 src/etc/rc.d/diskless 1.22 +160 -79 src/etc/rc.d/initdiskless 1.1 +12 -0 src/etc/rc.d/rcconf (new) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message