diff options
| author | Alexander Hall <halex@cvs.openbsd.org> | 2011-10-15 16:05:16 +0000 |
|---|---|---|
| committer | Alexander Hall <halex@cvs.openbsd.org> | 2011-10-15 16:05:16 +0000 |
| commit | d59bb2b95ef263e769850687e2912c90c3aa0ab7 (patch) | |
| tree | ad6acad9686708fde349675f4a87ed2988c5e448 /etc/rc.d | |
| parent | b952b3d1c8e9652eb00c2bfded3ad83fd1d7a74b (diff) | |
either set or unset variables that are to be examined further on, don't
just leave them untouched
ok ajacoutot@ sthen@ schwarze@
Diffstat (limited to 'etc/rc.d')
| -rw-r--r-- | etc/rc.d/rc.subr | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index 8cec999281a..fb14e386504 100644 --- a/etc/rc.d/rc.subr +++ b/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 <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -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 |