X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fbase-files%2Ffiles%2Fsbin%2Fusb-storage;h=e02efa81159f0db9dce3681b464a2e3fccb28ecd;hb=7cfa3c2593dceb09607a7ff8efb37ff303eff5f3;hp=b96e6a8f3fc46af2f86cf517d7605ad22cebc88d;hpb=b00cdd8b36fb34d91a67dc71d5ffc29636adab12;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/base-files/files/sbin/usb-storage b/package/base-files/files/sbin/usb-storage
old mode 100644
new mode 100755
index b96e6a8f3f..e02efa8115
--- a/package/base-files/files/sbin/usb-storage
+++ b/package/base-files/files/sbin/usb-storage
@@ -1,28 +1,25 @@
 #!/bin/sh
-
-# Copyright (C) 2006 OpenWrt.org
-
+# Copyright (C) 2007 OpenWrt.org
 logger "usb device is mass storage"
-i=0                                
+i=0
 while [ $i -le 10 ]; do
-	logger "waiting on usb drive $i ..."                         
+	logger "waiting on usb drive $i ..."
 	i=$(($i+1))
 	cd /sys${DEVPATH}
-	for blk in `find host* -type d`; do
-		cd /sys/${DEVPATH}/${blk}
-		BLK=$(find block* -type l 2> /dev/null)
-		[ -n "${BLK}" ] && {
-			cd /sys${DEVPATH}/${blk}/${BLK}
-			ls /dev/ > /tmp/d
-			sleep 2
-			for node in `find sd* -type d | grep -v "/"`; do
-				echo "mounting /dev/${node} on /mnt/usbdrive"
-				mkdir -p /mnt/usbdrive
-				mount /dev/${node} /mnt/usbdrive
-				exit 0
+	for blk in `find host* -type d 2>/dev/null`; do
+		[ -d /sys/${DEVPATH}/${blk}/block/ ] && {
+			cd 
+			for disc in `find /sys/${DEVPATH}/${blk}/block -name "sd*"`; do
+				sleep 2
+				cd $disc
+				for node in `find . -name "sd*" | cut -d "/" -f2`; do
+					echo "mounting /dev/${node} on /mnt/usbdrive"
+					mkdir -p /mnt/usbdrive
+					mount /dev/${node} /mnt/usbdrive
+					i=20	
+				done
 			done
 		}
 	done
 	sleep 1
-done 
-		
+done