diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-07-15 03:21:39 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2015-07-15 03:21:39 +0000 |
| commit | c5f3bb2c295e932e4554af1c89b2d61be3222011 (patch) | |
| tree | 0034a274230228172927796cd286e8495a47e5a6 /etc | |
| parent | 15afa26d1380b4d637e1f59b0fa1edc8afb76aa5 (diff) | |
Merge comments.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/rc.subr | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index 9287dbadaca..e55d92db954 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.96 2015/06/17 07:50:38 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.97 2015/07/15 03:21:38 ajacoutot Exp $ # # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -270,10 +270,9 @@ eval _rcflags=\${${_name}_flags} eval _rcuser=\${${_name}_user} eval _rctimeout=\${${_name}_timeout} -# set default values +# set default values; duplicated in rcctl(8) getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \ daemon_class=${_name} || daemon_class=daemon -# duplicated in rcctl(8) [ -z "${daemon_user}" ] && daemon_user=root [ -z "${daemon_timeout}" ] && daemon_timeout=30 |