summaryrefslogtreecommitdiffstats
path: root/xlators/mount
diff options
context:
space:
mode:
authorErnestas Lukoševičius <ernetas@gmail.com>2015-04-02 23:28:29 +0300
committerNiels de Vos <ndevos@redhat.com>2015-04-07 02:01:29 -0700
commita0e3634c6f0d349a3433cdbeabd93043f5f43e9d (patch)
treede83ba057795270e0384de0024de56b842711acb /xlators/mount
parentd1a5c805610115122b8ef61367b61425d7e39db5 (diff)
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>
Diffstat (limited to 'xlators/mount')
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in9
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');