diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-03-09 19:37:17 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-03-09 19:37:17 +0000 |
| commit | 30661a820dc3d7d2f740a4ae47e8ee4dd58fc008 (patch) | |
| tree | b860665f1b4cfaef0a5bd7efbcde9d4171513aa7 | |
| parent | c19b2e8187fc9822095c10032f4080c80cf12fc6 (diff) | |
Make reload and check consistent with start/stop.
ok robert@
| -rw-r--r-- | etc/rc.d/rc.subr | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index e179fa9afca..0cc7dfa5807 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.23 2011/03/09 18:50:46 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.24 2011/03/09 19:37:16 ajacoutot Exp $ rc_err() { echo $1 @@ -10,7 +10,7 @@ rc_start() { } rc_check() { - pgrep -f "^${pexp}" >/dev/null + pgrep -f "^${pexp}" } rc_reload() { @@ -32,7 +32,7 @@ rc_cmd() { case "$1" in check) - rc_check + rc_check >/dev/null ;; start) if ! rc_check; then @@ -51,7 +51,7 @@ rc_cmd() { type rc_post >/dev/null && rc_post || return 0 ;; reload) - rc_check && rc_reload + (rc_check && rc_reload) >/dev/null ;; restart) /etc/rc.d/${_name} stop && /etc/rc.d/${_name} start |