Browse Source

Merge comments.

OPENBSD_5_8
ajacoutot 8 years ago
parent
commit
7010e004e3
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      src/etc/rc.d/rc.subr

+ 2
- 3
src/etc/rc.d/rc.subr View File

@ -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


Loading…
Cancel
Save