Browse Source

when reloading do an rc_wait instead of just an rc_check

from david@, okay sthen@ and input from schwarze@
OPENBSD_5_0
robert 13 years ago
parent
commit
1779710298
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/etc/rc.d/rc.subr

+ 3
- 3
src/etc/rc.d/rc.subr View File

@ -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 Antoine Jacoutot <ajacoutot@openbsd.org>
# Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> # Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@ -59,7 +59,7 @@ rc_wait() {
[ -n "$2" ] && w=$2 || w=30 [ -n "$2" ] && w=$2 || w=30
while [ $i -lt $w ]; do while [ $i -lt $w ]; do
case "$1" in case "$1" in
start)
reload|start)
rc_do rc_check && return 0 rc_do rc_check && return 0
;; ;;
stop) stop)
@ -123,7 +123,7 @@ rc_cmd() {
rc_do rc_check || exit 0 rc_do rc_check || exit 0
echo $_n "${INRC:+ }${_name}" echo $_n "${INRC:+ }${_name}"
rc_do rc_reload || rc_exit failed 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 rc_exit ok
;; ;;
restart) restart)


Loading…
Cancel
Save