[DRBD-cvs] scripts by phil; * Renamed the missleading drbdadm comman...

[drbd-user@lists.linbit.com]

DRBD CVS committal

Author  : phil
Project : drbd
Module  : scripts

Dir     : drbd/scripts


Modified Files:
      Tag: rel-0_7-branch
	drbd 


Log Message:
* Renamed the missleading drbdadm command "sh-devices" to "sh-resources"
* Added "sh-dev" to drbdadm's commands
* Implemented proper udev support in drbd's sys-v-style init script

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/scripts/drbd,v
retrieving revision 1.27.2.8
retrieving revision 1.27.2.9
diff -u -3 -r1.27.2.8 -r1.27.2.9
--- drbd	30 Jun 2004 15:48:09 -0000	1.27.2.8
+++ drbd	1 Jul 2004 08:32:03 -0000	1.27.2.9
@@ -9,7 +9,7 @@
 #
 ### BEGIN INIT INFO
 # Provides: drbd
-# Required-Start: $network $syslog
+# Required-Start: $network $syslog sshd
 # Required-Stop:
 # Default-Start:  3 5
 # Default-Stop:   0 1 2 6
@@ -20,6 +20,7 @@
 PROC_DRBD="/proc/drbd"
 MODPROBE="modprobe"
 RMMOD="rmmod"
+UDEV_TIMEOUT=10
 
 function assure_module_is_loaded
 {
@@ -28,17 +29,25 @@
     $MODPROBE -s drbd `$DRBDADM sh-mod-parms` || { 
 	echo "Can not load the drbd module."$'\n'; exit 20 
     }
-    sleep 1 # make sure udev has time to create the device files
+
+    # make sure udev has time to create the device files
+    RESOURCE=`$DRBDADM sh-resources` || exit 20
+    RESOURCE=${RESOURCE%%\ *}
+    DEVICE=`$DRBDADM sh-dev $RESOURCE` || exit 20
+
+    while [ ! -e $DEVICE ] && [ $UDEV_TIMEOUT -gt 0 ] ; do
+        sleep 1
+	UDEV_TIMEOUT=$(( $UDEV_TIMEOUT-1 ))
+    done
 }
 
 case "$1" in
     start)
 	echo -n "Starting DRBD resources:    "
 	assure_module_is_loaded
-	DEVICES=`$DRBDADM sh-devices` || exit 20	
-	for I in $DEVICES; do
+	RESOURCES=`$DRBDADM sh-resources` || exit 20	
+	for I in $RESOURCES; do
 	    if $DRBDADM adjust $I; then
-	    #if $DRBDADM up $I; then
 	        echo -n "[$I]"
             else
                 echo -e "\n Failed setting up $I"