mount.glusterfs: mounting volumes with volume files

This is a patch for bug-1208676.

When using volume files to mount glusterfs volume,
this line is always true:

[ -z "$volume_id" -o -z "$server_ip" ] && {

That's because at this place, $volume_id and $server_ip are
set only and only if the $volfile_loc file was unreadable
or undefined.

Change-Id: Icdf7612ac13a8f953f2a2adaa426b6339cd9f8fd
BUG: 1208676
Signed-off-by: Ernestas Lukoševičius <ernetas@gmail.com>
Reviewed-on: http://review.gluster.org/10126
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 4348533b1a2..82660328363 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -590,16 +590,15 @@ main ()
             volume_id="$volume_str";
         }
         volfile_loc="";
-    }
-
-    [ -z "$volume_id" -o -z "$server_ip" ] && {
-        cat <<EOF >&2
+        [ -z "$volume_id" -o -z "$server_ip" ] && {
+            cat <<EOF >&2
 ERROR: Server name/volume name unspecified cannot proceed further..
 Please specify correct format
 Usage:
 man 8 $0
 EOF
-        exit 1;
+            exit 1;
+        }
     }
 
     grep_ret=$(echo ${mount_point} | grep '^\-o');