On Thu, Jan 25, 2018 at 8:39 AM, zhangyi (F) <yi.zhang@xxxxxxxxxx> wrote:
> Modify _is_mounted() to accept a dir and fstype as input, and check
> whether this dir is a specified type of mount point. This patch also
> fix the problem of invalid fstype check and remove invalid error
> message.
Which problem? How do you encounter this problem?
>
> Signed-off-by: zhangyi (F) <yi.zhang@xxxxxxxxxx>
Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx>
> ---
> common/rc | 25 ++++++++++---------------
> 1 file changed, 10 insertions(+), 15 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 77a4eb4..ceb5d44 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2372,27 +2372,22 @@ _scratch_mkfs_richacl()
> esac
> }
>
> -# check that a FS on a device is mounted
> +# check that a FS on a device is mounted or a dir is a mount point
> # if so, return mount point
> #
> _is_mounted()
> {
> - if [ $# -ne 1 ]
> - then
> - echo "Usage: _is_mounted device" 1>&2
> - exit 1
> - fi
> + if [ $# -lt 1 ]; then
> + echo "Usage: _is_mounted <device|mountpoint> [fstype]" 1>&2
> + exit 1
> + fi
>
> - device=$1
> + local name=$1
> + local fstype=${2-$FSTYP}
>
> - if _mount | grep "$device " | $AWK_PROG -v pattern="type $FSTYP" '
> - pattern { print $3 ; exit 0 }
> - END { exit 1 }
> - '
> - then
> - echo "_is_mounted: $device is not a mounted $FSTYP FS"
> - exit 1
> - fi
> + _mount | grep "$name " | $AWK_PROG -v pattern="type $fstype" '
> + $0 ~ pattern { print $3 }
> + '
> }
>
> # remount a FS to a new mode (ro or rw)
> --
> 2.5.0
>
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
