X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fblock-mount%2Ffiles%2Fmount.sh;h=583e1a5cab6a6f9339c2abacf2eb14c5686c5be2;hb=fb81ddaac3c9aeef1e31f6dfc1f6293ec54d61c0;hp=1616ca7a139cc90393bb6c50d72467e359ded17e;hpb=faf7173b4df3a152dbdc574751078b359c116d5b;p=openwrt-10.03%2F.git diff --git a/package/block-mount/files/mount.sh b/package/block-mount/files/mount.sh index 1616ca7a1..583e1a5ca 100644 --- a/package/block-mount/files/mount.sh +++ b/package/block-mount/files/mount.sh @@ -5,8 +5,8 @@ # -. /lib/functions/block.sh -. /lib/functions/fsck.sh +pi_include /lib/functions/block.sh +pi_include /lib/functions/fsck.sh config_mount_by_section() { local cfg="$1" @@ -28,14 +28,13 @@ config_mount_by_section() { local is_rootfs="$9" shift local found_device="" - local fsck_type="" 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 ]; then [ "$enabled_fsck" -eq 1 ] && { grep -q "$found_device" /proc/swaps || grep -q "$found_device" /proc/mounts || { - libmount_fsck "$found_device" "$fsck_type" "$enabled_fsck" + libmount_fsck "$found_device" "$fstype" "$enabled_fsck" } } @@ -72,7 +71,6 @@ config_swapon_by_section() { local label local found_device="" - local fsck_type="" found_device="$(libmount_find_device_by_id "$uuid" "$label" "$device" "$cfgdevice")"