diff options
author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-03-09 18:50:47 +0000 |
---|---|---|
committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2011-03-09 18:50:47 +0000 |
commit | c19b2e8187fc9822095c10032f4080c80cf12fc6 (patch) | |
tree | 287f178c9e5653a30fa3cdbd738dbf55f78d9108 | |
parent | f112bea47cdad4744a7ed02f5c826e078a452fa9 (diff) |
Move the redirections into the rc_cmd itself instead of rc_start and
rc_stop so scripts don't need to set it.
ok sthen@ (on a much bigger diff) 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 f9d7414af39..e179fa9afca 100644 --- a/etc/rc.d/rc.subr +++ b/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.22 2011/03/09 09:10:44 ajacoutot Exp $ +# $OpenBSD: rc.subr,v 1.23 2011/03/09 18:50:46 ajacoutot Exp $ rc_err() { echo $1 @@ -6,7 +6,7 @@ rc_err() { } rc_start() { - ${rcexec} "${daemon} ${daemon_flags} >/dev/null ${_bg}" + ${rcexec} "${daemon} ${daemon_flags} ${_bg}" } rc_check() { @@ -37,11 +37,11 @@ rc_cmd() { start) if ! rc_check; then type rc_pre >/dev/null && rc_pre - rc_start + rc_start >/dev/null fi ;; stop) - rc_stop + rc_stop >/dev/null i=0 while [ $i -lt 5 ]; do rc_check || break |