summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorHan Han <hhan@redhat.com>2018-10-15 09:53:06 +0800
committerAmar Tumballi <amarts@redhat.com>2018-10-24 10:18:58 +0000
commit87613d265a1a394d785daeed569b384cd74c6574 (patch)
tree5e7a9e91b03f923ee7a38462cbc4971e045d9501 /xlators
parentcf5b13896d65b6916634976a3a5f61ddeefbc19c (diff)
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 <hhan@redhat.com>
Diffstat (limited to 'xlators')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in2
1 files changed, 1 insertions, 1 deletions
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;