summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-01-02 08:03:29 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2015-01-02 08:03:29 +0000
commit0402bd905a2fd24166fa3c816015d6fb7cf32724 (patch)
tree60f80036bfd610d88925b2ce3de85eb6e05d300e /etc
parent4b214e93011330f1f42a8f313b430f7d2d362305 (diff)
Add a comment about the default values being duplicated in rcctl(8).
discussed with schwarze@
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/rc.subr7
1 files changed, 3 insertions, 4 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index 0c9c7dc2afc..02f67ff728f 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.90 2014/11/17 13:52:44 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.91 2015/01/02 08:03:28 ajacoutot Exp $
#
# Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,9 +16,6 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-# Default functions and variables used by rc.d(8) scripts.
-
_rc_err() {
echo "$1" 1>&2
[ -n "${2}" ] && exit "${2}" || exit 1
@@ -143,6 +140,7 @@ _rc_parse_conf() {
_rc_do _rc_quirks
}
+# return if we only want internal functions
[ -n "${FUNCS_ONLY}" ] && return
rc_start() {
@@ -267,6 +265,7 @@ eval _rctimeout=\${${_name}_timeout}
getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \
daemon_class=${_name}
+# set default values; duplicated in rcctl(8)
[ -z "${daemon_class}" ] && daemon_class=daemon
[ -z "${daemon_user}" ] && daemon_user=root
[ -z "${daemon_timeout}" ] && daemon_timeout=30