[DRBD-cvs] svn commit by phil - r2148 - in trunk: . scripts - Propagated a fix to the init script to the trunk

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-04-13 18:28:56 +0200 (Thu, 13 Apr 2006)
New Revision: 2148

Modified:
   trunk/
   trunk/scripts/drbd
Log:
Propagated a fix to the init script to the trunk



Property changes on: trunk
___________________________________________________________________
Name: propagate:at
   - 2117
   + 2147

Modified: trunk/scripts/drbd
===================================================================
--- trunk/scripts/drbd	2006-04-13 16:26:10 UTC (rev 2147)
+++ trunk/scripts/drbd	2006-04-13 16:28:56 UTC (rev 2148)
@@ -41,13 +41,14 @@
     [ -e /var/run/klogd.pid ] && [ -x /sbin/klogd ] && /sbin/klogd -i
 
     # 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 ))
+    for RESOURCE in `$DRBDADM sh-resources`; do
+	for DEVICE in `$DRBDADM sh-dev $RESOURCE`; do
+	    UDEV_TIMEOUT_LOCAL=$UDEV_TIMEOUT
+	    while [ ! -e $DEVICE ] && [ $UDEV_TIMEOUT_LOCAL -gt 0 ] ; do
+		sleep 1
+		UDEV_TIMEOUT_LOCAL=$(( $UDEV_TIMEOUT_LOCAL-1 ))
+	    done
+	done
     done
 }