hotplug scsi.agent script avoid race on scsi type attribute

diff -uprN -X /home/patman/dontdiff hotplug-2004_01_05-orig/etc/hotplug/scsi.agent hotplug-2004_01_05/etc/hotplug/scsi.agent
@@ -18,7 +18,26 @@ add)
 	exit 1
     fi
 
-    TYPE=$(cat /sys/$DEVPATH/type)
+    TYPE_ATTR=/sys$DEVPATH/type
+
+    # Possibly sleep here to try and avoid races with scsi attributes and block
+    # devices
+    count
+    while [ ! -f $TYPE_ATTR -a $count -gt 0 ]
+    do
+	# We seem to always hit this now, so don't output any message.
+	debug_mesg "waiting for $TYPE_ATTR"
+	sleep 1
+	let count=count+1
+    done
+
+    if [ ! -f $TYPE_ATTR ]
+    then
+    	mesg "Attribute $TYPE_ATTR does not exist"
+	exit 1
+    fi
+
+    TYPE=$(cat $TYPE_ATTR) 
     case "$TYPE" in
     # 2.5.51 style attributes; <scsi/scsi.h> TYPE_* constants
     0)		TYPE=disk ; MODULE=sd_mod ;;