summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2011-07-08 17:43:59 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2011-07-08 17:43:59 +0000
commitf2a091a96dec89129a57a0a235b86035d93484c5 (patch)
tree803eb1156b2eacf45b615b39691c131fc1a4bd53 /share
parent858fb9c4a1b9a9eb6297711dc89eb42b7e483f0e (diff)
Make a distinction between base/pkg rc scripts. ok aja@ schwarze@ jmc@
(with a tweak from jmc).
Diffstat (limited to 'share')
-rw-r--r--share/man/man8/rc.conf.84
-rw-r--r--share/man/man8/rc.d.812
2 files changed, 11 insertions, 5 deletions
diff --git a/share/man/man8/rc.conf.8 b/share/man/man8/rc.conf.8
index ab24e3384ed..cd28b521649 100644
--- a/share/man/man8/rc.conf.8
+++ b/share/man/man8/rc.conf.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rc.conf.8,v 1.18 2011/07/08 02:14:13 ajacoutot Exp $
+.\" $OpenBSD: rc.conf.8,v 1.19 2011/07/08 17:43:58 sthen Exp $
.\"
.\" Copyright (c) 1997 Ian F. Darwin
.\" All rights reserved.
@@ -105,7 +105,7 @@ The fourth section contains the
.Va pkg_scripts
variable, responsible for starting and stopping
.Xr rc.d 8
-scripts in the specified order.
+scripts installed by packages in the specified order.
For example, the following line
.Bd -literal -offset indent
pkg_scripts="dbus_daemon cupsd"
diff --git a/share/man/man8/rc.d.8 b/share/man/man8/rc.d.8
index 1343f0e9403..d9e2391a736 100644
--- a/share/man/man8/rc.d.8
+++ b/share/man/man8/rc.d.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rc.d.8,v 1.15 2011/07/08 02:14:13 ajacoutot Exp $
+.\" $OpenBSD: rc.d.8,v 1.16 2011/07/08 17:43:58 sthen Exp $
.\"
.\" Copyright (c) 2011 Robert Nagy, Antoine Jacoutot, Ingo Schwarze
.\" All rights reserved.
@@ -39,11 +39,17 @@ directory contains shell scripts to start, stop, and reconfigure daemon
programs
.Pq Dq services .
.Pp
-Those services may be started at boot time in the order specified by the
+Services installed from
+.Xr packages 7
+may be started at boot time in the order specified by the
.Va pkg_scripts
variable from
-.Xr rc.conf 8 ,
+.Xr rc.conf 8 ;
the order will be reversed during shutdown.
+Services comprising
+.Ox
+base are started by
+.Xr rc 8 .
.Pp
Each such script responds to the following
.Ar actions :