From owner-cvs-src@FreeBSD.ORG Thu Oct 25 14:04:19 2007 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E3C516A418; Thu, 25 Oct 2007 14:04:19 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B76913C465; Thu, 25 Oct 2007 14:04:19 +0000 (UTC) (envelope-from mtm@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9PE4J8c022713; Thu, 25 Oct 2007 14:04:19 GMT (envelope-from mtm@repoman.freebsd.org) Received: (from mtm@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9PE4J1r022712; Thu, 25 Oct 2007 14:04:19 GMT (envelope-from mtm) Message-Id: <200710251404.l9PE4J1r022712@repoman.freebsd.org> From: Mike Makonnen Date: Thu, 25 Oct 2007 14:04:19 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/etc rc.subr src/etc/rc.d fsck ipsec mountcritlocal mountlate root src/share/man/man8 rc.8 rc.subr.8 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: Thu, 25 Oct 2007 14:04:19 -0000 mtm 2007-10-25 14:04:19 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) etc rc.subr etc/rc.d fsck ipsec mountcritlocal mountlate root share/man/man8 rc.8 rc.subr.8 Log: MFC: o Implement the stop_boot subroutine [1]. This subroutine can be used by scripts in rc.d to stop rc(8) from booting into multi-user mode when a critical or severe error condition is encountered. o Modify scripts in etc/rc.d that already implemented this functionality independently. o Document it. [1] - This subroutine was implemented in FreeBSD in rc.d/fsck. I moved it to rc.subr(8). Our version differs slightly in that it takes an optional argument to stop the boot even if "autoboot" is not set. Obtained from: NetBSD Revision Changes Path 1.10.2.1 +0 -11 src/etc/rc.d/fsck 1.11.2.4 +1 -9 src/etc/rc.d/ipsec 1.12.2.2 +1 -1 src/etc/rc.d/mountcritlocal 1.1.2.2 +1 -1 src/etc/rc.d/mountlate 1.10.2.3 +1 -1 src/etc/rc.d/root 1.34.2.23 +22 -0 src/etc/rc.subr 1.29.2.2 +6 -11 src/share/man/man8/rc.8 1.6.8.9 +18 -1 src/share/man/man8/rc.subr.8