[package] block-mount: Fixed shell error on empty string due to -eq to number for...
authorcshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 28 Feb 2011 01:46:46 +0000 (01:46 +0000)
committercshore <cshore@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 28 Feb 2011 01:46:46 +0000 (01:46 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25787 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/block-mount/files/mount.sh

index ade39ad..3056c73 100644 (file)
@@ -31,14 +31,14 @@ config_mount_by_section() {
                
                found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"
                if [ -n "$found_device" ]; then
-                       if [ -z "$find_rootfs" ] || [ "$find_rootfs" -eq 0 ] || ( [ "$is_rootfs" -eq 1 ] || [ "$target" = "/" ] || [ "$target" = "/overlay" ] ); then
+                       if [ "$find_rootfs" != "1" ] || ( [ "$is_rootfs" -eq 1 ] || [ "$target" = "/" ] || [ "$target" = "/overlay" ] ); then
                                [ "$enabled_fsck" -eq 1 ] && {
                                        grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || {
                                                libmount_fsck "$found_device" "$fstype" "$enabled_fsck"
                                        }
                                }                                                               
        
-                               if [ "$find_rootfs" -eq 1 ]; then
+                               if [ "$find_rootfs" = "1" ]; then
                                    if [ "$is_rootfs" -eq 1 ]; then
                                        target=/overlay
                                    fi
@@ -55,7 +55,7 @@ config_mount_by_section() {
                                
                        fi
                fi
-               [ "$find_rootfs" -eq 1 ] && {
+               [ "$find_rootfs" = "1" ] && {
                    [ "$target" = "/overlay" ] && {
                        rootfs_found=1
                    }