X-Git-Url: https://secure.softndesign.org/git/?a=blobdiff_plain;f=master%2Fetc%2Finit.d%2Fwaitslaves;h=ec6fab0928967fdc906cc81f26def56ebd673e3c;hb=aa1a77f38ec5c946f83373ed76759cbc70cf17b5;hp=2354742817aa4c12f0a946bf77a9970dc90201fc;hpb=a3300608811441c5238911ca14e56433ea4f4c5f;p=debian6500.git

diff --git a/master/etc/init.d/waitslaves b/master/etc/init.d/waitslaves
index 2354742..ec6fab0 100755
--- a/master/etc/init.d/waitslaves
+++ b/master/etc/init.d/waitslaves
@@ -9,9 +9,9 @@ VER=1.0
 
 ### BEGIN INIT INFO
 # Provides:          waitslaves
-# Required-Start:    $network $sshd isc-dhcp-server atftpd nfs-kernel-server wakeonlan etherwake
+# Required-Start:    $network $sshd isc-dhcp-server atftpd nfs-kernel-server wakeonlan etherwake ipmiwake
 # Required-Stop:
-# Should-Start:
+# Should-Start:      
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Wait cluster slave blades
@@ -19,19 +19,21 @@ VER=1.0
 ### END INIT INFO
 
 ENABLE="yes"
-SCRIPT=/opt/trc6500/script/check_network.sh
+SCRIPTS="/opt/script/check_network /opt/trc6500/script/check_network"
+SCRIPT=
 TIMEOUT=360
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 [ -f /etc/default/waitslaves ] && . /etc/default/waitslaves
-[ -x $SCRIPT ] || exit 1
+for s in $SCRIPTS; do [ -x $s ] && SCRIPT=$s; done
+[ -x "$SCRIPT" ] || exit 1
 [ "$ENABLE" = "yes" ] || exit 0
 
 . /lib/lsb/init-functions
 
 do_start () {
-    log_action_msg "Waite all slave blades"
-    $SCRIPT -t $TIMEOUT -w -c 'test -e /home/trc6500 && echo ok'
+    log_action_msg "Wait all slave blades"
+    $SCRIPT -t $TIMEOUT -x -w -c 'test -e /home/trc6500 && echo ok'
 }
 
 case "$1" in