hook rc.subr.8 to the build and create a link to rc.d.8 and

document the missing pieces in rc(8) and rc.shutdown(8)

3 files changed, 38 insertions, 9 deletions

diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile
index c7403851ed8..8e728b0270d 100644
--- a/share/man/man8/Makefile
+++ b/share/man/man8/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.73 2010/07/05 22:26:20 tedu Exp $
+#	$OpenBSD: Makefile,v 1.74 2011/01/16 14:20:54 robert Exp $
 #	$NetBSD: Makefile,v 1.13 1996/03/28 21:36:40 mark Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
@@ -6,13 +6,14 @@ MAN=	afterboot.8 boot_config.8 compat_aout.8 \
 	compat_freebsd.8 compat_linux.8 \
 	compat_svr4.8 crash.8 daily.8 dhcp.8 \
 	diskless.8 genassym.sh.8 intro.8 netstart.8 rc.8 \
-	rc.conf.8 rc.shutdown.8 release.8 security.8 ssl.8 \
-	starttls.8 sticky.8 update.8 yp.8
+	rc.conf.8 rc.shutdown.8 rc.subr.8 release.8 \
+	security.8 ssl.8 starttls.8 sticky.8 update.8 yp.8
 
 MLINKS+=boot_config.8 UKC.8
 MLINKS+=daily.8 weekly.8 daily.8 monthly.8
 MLINKS+=rc.8 rc.local.8 rc.8 rc.securelevel.8
 MLINKS+=rc.conf.8 rc.conf.local.8
+MLINKS+=rc.subr.8 rc.d.8
 
 SUBDIR=	man8.alpha man8.amd64 man8.armish man8.aviion man8.hp300 \
 	man8.hppa man8.hppa64 man8.i386 man8.landisk man8.loongson \
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index c50b39ecd81..f1f3f9cb160 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rc.8,v 1.27 2010/09/26 06:27:45 jmc Exp $
+.\"	$OpenBSD: rc.8,v 1.28 2011/01/16 14:20:54 robert Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: September 26 2010 $
+.Dd $Mdocdate: January 16 2011 $
 .Dt RC 8
 .Os
 .Sh NAME
@@ -146,9 +146,15 @@ is executed towards the end of
 .Nm rc
 (it is not the very last as there are a few services that must be
 started at the very end).
+.Nm rc.local
+is also used to execute
+.Xr rc.d 8
+scripts defined in the rc_scripts variable in
+.Nm rc.conf
+in the specified order.
 Normally,
 .Nm rc.local
-contains commands and daemons that are not part of the
+also contains commands and daemons that are not part of the
 stock installation.
 .Sh CONFIGURATION EXAMPLES
 The
@@ -191,6 +197,14 @@ flag (to log remote connections):
 .Bd -literal -offset indent
 lpd_flags="-l"      # for normal use: "" (or "-l" for debugging)
 .Ed
+.Pp
+To start the the a and b
+.Xr rc.d 8
+scripts in a reserved order, one could specify rc_scripts in the
+the following way:
+.Bd -literal -offset indent
+rc_scripts="b a"
+.Ed
 .Sh EXTERNAL INFLUENCES
 Before
 .Xr init 8
@@ -204,6 +218,14 @@ login class as described in
 .Bl -tag -width "/etc/rc.securelevelXX" -compact
 .It Pa /etc/rc
 Command scripts for system startup.
+.It Pa /etc/rc.d
+Directory to hold
+.Xr rc.d 8
+scripts.
+.It Pa /etc/rc.d/rc.subr
+File that contains functions used by the
+.Xr rc.d 8
+scripts.
 .It Pa /etc/rc.local
 Site specific command scripts for system startup.
 .It Pa /etc/rc.conf
@@ -234,6 +256,7 @@ during the next boot.
 .Xr init 8 ,
 .Xr netstart 8 ,
 .Xr rc.conf 8 ,
+.Xr rc.d 8 ,
 .Xr rc.shutdown 8 ,
 .Xr reboot 8 ,
 .Xr savecore 8
diff --git a/share/man/man8/rc.shutdown.8 b/share/man/man8/rc.shutdown.8
index 119d29286e1..0e2378a49ed 100644
--- a/share/man/man8/rc.shutdown.8
+++ b/share/man/man8/rc.shutdown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rc.shutdown.8,v 1.8 2007/05/31 19:19:59 jmc Exp $
+.\"	$OpenBSD: rc.shutdown.8,v 1.9 2011/01/16 14:20:54 robert Exp $
 .\"
 .\" Copyright (c) 1999 Aaron Campbell
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: January 16 2011 $
 .Dt RC.SHUTDOWN 8
 .Os
 .Sh NAME
@@ -44,7 +44,11 @@ which checks for the existence of a
 script to run before halting the system.
 This script, like
 .Xr rc.local 8 ,
-is entirely for commands added by the system administrator.
+executes the
+.Xr rc.d 8
+scripts specified by the rc_scripts variable in a reversed order.
+.Pa /etc/rc.shutdown
+is also for commands added by the system administrator.
 .Pp
 The
 .Nm
@@ -64,4 +68,5 @@ will attempt to power down the machine after it has halted.
 .Xr halt 8 ,
 .Xr init 8 ,
 .Xr rc 8 ,
+.Xr rc.d 8 ,
 .Xr reboot 8