From 87613d265a1a394d785daeed569b384cd74c6574 Mon Sep 17 00:00:00 2001 From: Han Han Date: Mon, 15 Oct 2018 09:53:06 +0800 Subject: mount.glusterfs: A more explicit check to avoid identical mounts Change check condition from "[[:space:]+]${mount_point}[[:space:]+]fuse" to "[[:space:]+]${mount_point}[[:space:]+]fuse.glusterfs". Fix false postive check result for mount points of other FUSEes, such as "fuse.sshfs". Change-Id: I13898b50a651a8f5ecc3a94d01b3b5de37ec4cbc fixes: bz#1640026 Signed-off-by: Han Han --- xlators/mount/fuse/utils/mount.glusterfs.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators/mount/fuse') diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in index 122c4f2892e..40172fc421d 100755 --- a/xlators/mount/fuse/utils/mount.glusterfs.in +++ b/xlators/mount/fuse/utils/mount.glusterfs.in @@ -762,7 +762,7 @@ EOF } # Simple check to avoid multiple identical mounts - if grep -q "[[:space:]+]${mount_point}[[:space:]+]fuse" $mounttab; then + if grep -q "[[:space:]+]${mount_point}[[:space:]+]fuse.glusterfs" $mounttab; then warn "$0: according to mtab, GlusterFS is already mounted on" \ "$mount_point" exit 32; -- cgit