small tweaks to the usb disk hotplug scripts

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5667 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 db8ccdabd605588153cee4630a4fe66faf8c3e08..5ed3ef060b5ad38e32794a835b2bd839a8e8d590 100755 (executable)
--- 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 f9eda02988fc22fd056d8b86bcc98948da0ba70a..8ec8f558565b7fe52f03de2032c2d69bac8f9509 100755 (executable)
--- 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