diff options
| author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-02-28 01:46:46 +0000 |
|---|---|---|
| committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2011-02-28 01:46:46 +0000 |
| commit | 7f21b3000c802b5282c5ae23a844c005dd28e40e (patch) | |
| tree | 925522291198e86e16bb41a34a7b0f6377b99b4d /package/block-mount/files | |
| parent | b2321ba263c403b7c0efcbdda7b3c167ee109aec (diff) | |
| download | upstream-7f21b3000c802b5282c5ae23a844c005dd28e40e.tar.gz upstream-7f21b3000c802b5282c5ae23a844c005dd28e40e.tar.bz2 upstream-7f21b3000c802b5282c5ae23a844c005dd28e40e.zip | |
[package] block-mount: Fixed shell error on empty string due to -eq to number for the optional find_root variable
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25787 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/block-mount/files')
| -rw-r--r-- | package/block-mount/files/mount.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh index ade39ad87f..3056c73aa9 100644 --- a/package/block-mount/files/mount.sh +++ b/package/block-mount/files/mount.sh @@ -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 } |