From a0e3634c6f0d349a3433cdbeabd93043f5f43e9d Mon Sep 17 00:00:00 2001 From: Ernestas Lukoševičius Date: Thu, 2 Apr 2015 23:28:29 +0300 Subject: mount.glusterfs: mounting volumes with volume files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.gluster.org/10126 Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- xlators/mount/fuse/utils/mount.glusterfs.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'xlators/mount/fuse/utils/mount.glusterfs.in') 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 <&2 + [ -z "$volume_id" -o -z "$server_ip" ] && { + cat <&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'); -- cgit