aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dickinson <crazycshore@gmail.com>2011-02-28 01:46:46 +0000
committerDaniel Dickinson <crazycshore@gmail.com>2011-02-28 01:46:46 +0000
commit47370c1fa44407919d559f9612385e52fb37e4f4 (patch)
tree50f7ec08c8795b0d92e888be702dadabe8d21e08
parentdb0bff2724b5e847050402b83173163af609ce26 (diff)
downloadupstream-47370c1fa44407919d559f9612385e52fb37e4f4.tar.gz
upstream-47370c1fa44407919d559f9612385e52fb37e4f4.tar.bz2
upstream-47370c1fa44407919d559f9612385e52fb37e4f4.zip
block-mount: Fixed shell error on empty string due to -eq to number for the optional find_root variable
SVN-Revision: 25787
-rw-r--r--package/block-mount/files/mount.sh6
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
}