From d95968b0d3e71d249ccf3d6da1c25b7d38b23174 Mon Sep 17 00:00:00 2001 From: halex <> Date: Sat, 15 Oct 2011 16:05:15 +0000 Subject: [PATCH] either set or unset variables that are to be examined further on, don't just leave them untouched ok ajacoutot@ sthen@ schwarze@ --- src/etc/rc.d/rc.subr | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index 8cec9992..fb14e386 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.54 2011/10/12 23:04:02 schwarze Exp $ +# $OpenBSD: rc.subr,v 1.55 2011/10/15 16:05:15 halex Exp $ # # Copyright (c) 2010, 2011 Antoine Jacoutot # Copyright (c) 2010, 2011 Ingo Schwarze @@ -95,13 +95,15 @@ rc_wait() { } rc_cmd() { + local _bg _n + [ -z "${_RC_FORCE}" ] && [ X"${daemon_flags}" = X"NO" ] && exit 1 eval _enotsup=\${rc_${1}} [ X"${_enotsup}" != X"NO" ] || rc_err "$0: $1 is not supported" - [ X"${rc_bg}" = X"YES" ] && local _bg="&" - [ -n "${_RC_DEBUG}" ] || local _n="-n" + [ X"${rc_bg}" = X"YES" ] && _bg="&" + [ -n "${_RC_DEBUG}" ] || _n="-n" rc_do rc_read_runfile