Browse Source

Simplify rc_wait() (no functionnal change).

initially from robert at peichaer dot org with some enhancement by halex@
ok halex@
OPENBSD_5_2
ajacoutot 12 years ago
parent
commit
bcc6bf7102
1 changed files with 4 additions and 5 deletions
  1. +4
    -5
      src/etc/rc.d/rc.subr

+ 4
- 5
src/etc/rc.d/rc.subr View File

@ -1,4 +1,4 @@
# $OpenBSD: rc.subr,v 1.57 2012/05/30 08:19:14 espie Exp $
# $OpenBSD: rc.subr,v 1.58 2012/07/07 10:28:07 ajacoutot 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>
@ -74,9 +74,8 @@ rc_exit() {
} }
rc_wait() { rc_wait() {
i=0
[ -n "$2" ] && w=$2 || w=30
while [ $i -lt $w ]; do
local _i=0 _w=${2:-30}
while [ $_i -lt $_w ]; do
case "$1" in case "$1" in
reload|start) reload|start)
rc_do rc_check && return 0 rc_do rc_check && return 0
@ -89,7 +88,7 @@ rc_wait() {
;; ;;
esac esac
sleep 1 sleep 1
i=$((i+1))
_i=$((_i+1))
done done
return 1 return 1
} }


Loading…
Cancel
Save