From 1779710298d7c4040ea98604b2924309eda77c39 Mon Sep 17 00:00:00 2001 From: robert <> Date: Sun, 31 Jul 2011 20:22:34 +0000 Subject: [PATCH] when reloading do an rc_wait instead of just an rc_check from david@, okay sthen@ and input from schwarze@ --- src/etc/rc.d/rc.subr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/rc.d/rc.subr b/src/etc/rc.d/rc.subr index a400dc5e..e6f697b3 100644 --- a/src/etc/rc.d/rc.subr +++ b/src/etc/rc.d/rc.subr @@ -1,4 +1,4 @@ -# $OpenBSD: rc.subr,v 1.44 2011/07/31 20:18:45 robert Exp $ +# $OpenBSD: rc.subr,v 1.45 2011/07/31 20:22:34 robert Exp $ # # Copyright (c) 2010, 2011 Antoine Jacoutot # Copyright (c) 2010, 2011 Ingo Schwarze @@ -59,7 +59,7 @@ rc_wait() { [ -n "$2" ] && w=$2 || w=30 while [ $i -lt $w ]; do case "$1" in - start) + reload|start) rc_do rc_check && return 0 ;; stop) @@ -123,7 +123,7 @@ rc_cmd() { rc_do rc_check || exit 0 echo $_n "${INRC:+ }${_name}" rc_do rc_reload || rc_exit failed - rc_do rc_check || rc_exit failed + rc_do rc_wait reload || rc_exit failed rc_exit ok ;; restart)