From 47370c1fa44407919d559f9612385e52fb37e4f4 Mon Sep 17 00:00:00 2001 From: Daniel Dickinson Date: Mon, 28 Feb 2011 01:46:46 +0000 Subject: [PATCH] block-mount: Fixed shell error on empty string due to -eq to number for the optional find_root variable SVN-Revision: 25787 --- package/block-mount/files/mount.sh | 6 +++--- 1 file 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 }