From ec3e2016f6827213d94ed4c738e8f20a55b36846 Mon Sep 17 00:00:00 2001 From: ajacoutot <> Date: Wed, 9 Mar 2011 19:37:16 +0000 Subject: [PATCH] Make reload and check consistent with start/stop. ok robert@ --- src/etc/rc.d/rc.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index e179fa9a..0cc7dfa5 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/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