From: Mike Baker <mbm@openwrt.org>
Date: Tue, 28 Nov 2006 18:37:37 +0000 (+0000)
Subject: small tweaks to the usb disk hotplug scripts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=64b7e4e4cf5008d687a24b6456278f700b021cf0;p=openwrt%2Fstaging%2Fnbd.git

small tweaks to the usb disk hotplug scripts

SVN-Revision: 5667
---

diff --git a/package/base-files/files/etc/hotplug.d/block/01-mount b/package/base-files/files/etc/hotplug.d/block/01-mount
index db8ccdabd6..5ed3ef060b 100755
--- a/package/base-files/files/etc/hotplug.d/block/01-mount
+++ b/package/base-files/files/etc/hotplug.d/block/01-mount
@@ -3,15 +3,15 @@
 
 DEV=${DEVPATH##*/}
 {
-echo "ACTION=$ACTION DEVPATH=$DEVPATH $0 $*"
 case "$ACTION" in
 add)
 	echo -ne "waiting for $DEV"
 	while [ ! -b /dev/$DEV ]; do {
 		echo -ne "."
 		sleep 1
-		time=$((time+1)); [ $time -gt 10 ] && break
+		[ $((++time)) -gt 10 ] && break
 	}; done
+	echo
 	
 	[ ${DEV%%[0-9]} != ${DEV} ] && {
 		mkdir -p /tmp/$DEV
@@ -19,8 +19,7 @@ add)
 	}
 	;;
 remove)
-	umount /tmp/$DEV && rmdir /tmp/$DEV
-	rm -f /dev/$DEV /tmp/$DEV
+	umount /tmp/$DEV && rm -f /dev/$DEV /tmp/$DEV
 	;;
 esac
 } 2>&1 | logger
diff --git a/package/base-files/files/etc/hotplug.d/usb/01-ln b/package/base-files/files/etc/hotplug.d/usb/01-ln
index f9eda02988..8ec8f55856 100755
--- a/package/base-files/files/etc/hotplug.d/usb/01-ln
+++ b/package/base-files/files/etc/hotplug.d/usb/01-ln
@@ -3,7 +3,7 @@
 
 case "$ACTION" in
 add) 
-	[ -f /sys/${DEVPATH}/idVendor -a "$(cat /sys/${DEVPATH}/idVendor)" -ne "0000" ] && {
+	[ -f /sys/${DEVPATH}/idVendor -a "$(cat /sys/${DEVPATH}/idVendor)" != "0000" ] && {
 		cd /sys/${DEVPATH}
 
 		NUM=${DEVPATH##*/}
@@ -15,7 +15,7 @@ add)
 		while [ ! -d "/dev/scsi/host${HOST}/bus0/target0/lun0" ]; do {
 			echo -ne "."
 			sleep 1;
-			time=$((time+1)); [ $time -gt 10 ] && break
+			[ "$((++time))" -gt 10 ] && break
 		}; done
 		echo