From f3b3e35b8a2c49514284bf1e57faa9192509fd5b Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@redhat.com>
Date: Fri, 12 Dec 2014 11:45:11 +0100
Subject: mount: Verify mount failure in mount.glusterfs wrapper.

The result of mount command execution is not checked properly, thus
no proper message given for the end user. This patch fix the same.

Cherry picked from commit 76b72680017c836eff8805ea0339f7827ba3e561:
> Bug Id: 1128165
> Change-Id: I3882e34e840ed15b5ce48ed5e1ad51208e2be913
> Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
> Reviewed-on: http://review.gluster.org/8438
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Niels de Vos <ndevos@redhat.com>

BUG: 1173513
Change-Id: I3882e34e840ed15b5ce48ed5e1ad51208e2be913
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9270
Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Tested-by: Raghavendra Bhat <raghavendra@redhat.com>
---
 xlators/mount/fuse/utils/mount.glusterfs.in | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'xlators/mount')

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index c604951c978..7852e385339 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -297,6 +297,11 @@ start_glusterfs ()
     cmd_line=$(echo "$cmd_line $mount_point");
 
     $cmd_line;
+    if [ $? -ne 0 ]; then
+        warn "Mount failed. Please check the log file for more details."
+        exit 1;
+    fi
+
 
     inode=$( ${getinode} $mount_point 2>/dev/null);
     # this is required if the stat returns error
-- 
cgit