Browse Source

In debug mode, make it clear when we are using the default flags when

none are set.
initial patch from me but reworked by schwarze@
ok schwarze@
OPENBSD_5_7
ajacoutot 10 years ago
parent
commit
c7aa843432
1 changed files with 7 additions and 5 deletions
  1. +7
    -5
      src/etc/rc.d/rc.subr

+ 7
- 5
src/etc/rc.d/rc.subr View File

@ -1,4 +1,4 @@
# $OpenBSD: rc.subr,v 1.83 2014/08/24 07:55:20 ajacoutot Exp $
# $OpenBSD: rc.subr,v 1.84 2014/08/24 13:29:16 ajacoutot Exp $
# #
# Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011, 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@ -142,10 +142,6 @@ _rc_parse_conf() {
done done
_rc_do _rc_quirks _rc_do _rc_quirks
if [ -n "${_RC_DEBUG}" ]; then
echo "${_name}_flags >$(eval echo \${${_name}_flags})<"
fi
} }
[ -n "${FUNCS_ONLY}" ] && return [ -n "${FUNCS_ONLY}" ] && return
@ -282,6 +278,12 @@ getcap -f /etc/login.conf ${_name} 1>/dev/null 2>&1 && \
[ -n "${_rcuser}" ] && daemon_user=${_rcuser} [ -n "${_rcuser}" ] && daemon_user=${_rcuser}
[ -n "${_rctimeout}" ] && daemon_timeout=${_rctimeout} [ -n "${_rctimeout}" ] && daemon_timeout=${_rctimeout}
if [ -n "${_RC_DEBUG}" ]; then
echo -n "${_name}_flags "
[ -n "${_rcflags}" ] && echo -n "empty, using default "
echo ">${daemon_flags}<"
fi
readonly daemon_class readonly daemon_class
unset _rcflags _rcuser _rctimeout unset _rcflags _rcuser _rctimeout
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}" pexp="${daemon}${daemon_flags:+ ${daemon_flags}}"


Loading…
Cancel
Save