summaryrefslogtreecommitdiff
path: root/etc/rc.d/rc.subr
diff options
context:
space:
mode:
authorAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2012-08-11 17:55:59 +0000
committerAntoine Jacoutot <ajacoutot@cvs.openbsd.org>2012-08-11 17:55:59 +0000
commit0f6081e4606f44253f282cc189570603a7126b97 (patch)
treef6e9c6d52360767cef65cc31fc2cd6a5ce655dcf /etc/rc.d/rc.subr
parent172bb04215692bef2f4745b69e287ae5ef52e0e7 (diff)
Make a couple of variables local.
from robert at peichaer dot org ok halex@
Diffstat (limited to 'etc/rc.d/rc.subr')
-rw-r--r--etc/rc.d/rc.subr5
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr
index e5359d99dc5..0edcc4de989 100644
--- a/etc/rc.d/rc.subr
+++ b/etc/rc.d/rc.subr
@@ -1,4 +1,4 @@
-# $OpenBSD: rc.subr,v 1.59 2012/08/04 15:30:25 ajacoutot Exp $
+# $OpenBSD: rc.subr,v 1.60 2012/08/11 17:55:58 ajacoutot Exp $
#
# Copyright (c) 2010, 2011 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -68,6 +68,7 @@ rc_do() {
}
rc_exit() {
+ local _pfix
[ -z "${INRC}" -o X"$1" != X"ok" ] && _pfix="($1)"
echo ${INRC:+'-n'} "${_pfix}"
[ X"$1" = X"ok" ] && exit 0 || exit 1
@@ -94,7 +95,7 @@ rc_wait() {
}
rc_cmd() {
- local _bg _n
+ local _bg _enotsup _n
[ "$(id -u)" -eq 0 ] || \
[ X"${rc_usercheck}" != X"NO" -a X"$1" = "Xcheck" ] || \