diff options
| author |   robert <robert@openbsd.org> | 2011-07-31 20:22:34 +0000 |
|---|---|---|
| committer | robert <robert@openbsd.org> | 2011-07-31 20:22:34 +0000 |
| commit | 0abcb5c971e163ab301100a973473c20f13794ce (patch) | |
| tree | b469e5bcbbcda3ffddc31ab3041772ce62b903d5 | |
| parent | redirect rc_err() output to stderr, from david@ (diff) | |
| download | wireguard-openbsd-0abcb5c971e163ab301100a973473c20f13794ce.tar.xz wireguard-openbsd-0abcb5c971e163ab301100a973473c20f13794ce.zip | |
when reloading do an rc_wait instead of just an rc_check
from david@, okay sthen@ and input from schwarze@
| -rw-r--r-- | etc/rc.d/rc.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.d/rc.subr b/etc/rc.d/rc.subr index a400dc5e1e3..e6f697b3e4d 100644 --- a/etc/rc.d/rc.subr +++ b/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 <ajacoutot@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> @@ -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) |