summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmar Tumballi <amar@gluster.com>2010-07-20 00:23:23 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-20 20:44:11 -0700
commite235a743d2b4d409945770a6d5f803360932bd3d (patch)
treeee022d71a5411ffa252ab46714af3d78c7b38b6a
parent24a8879abfd075836f064b688610c6616184eec3 (diff)
fix mount.gluster so there is no fixed default port
Signed-off-by: Amar Tumballi <amar@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 1171 (mount.glusterfs has old/stale port values as default..) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1171
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 0ea0bdd8c6e..e453ede3ed8 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -97,7 +97,9 @@ start_glusterfs ()
if [ -z "$volfile_loc" ]; then
if [ -n "$server_ip" ]; then
- cmd_line=$(echo "$cmd_line --volfile-server-port=$server_port");
+ if [ -n "$server_port" ]; then
+ cmd_line=$(echo "$cmd_line --volfile-server-port=$server_port");
+ fi
if [ -n "$transport" ]; then
cmd_line=$(echo "$cmd_line --volfile-server-transport=$transport");
fi
@@ -190,10 +192,6 @@ main ()
volfile_loc="";
}
- [ -n "$server_port" ] || {
- server_port="6996";
- }
-
new_fs_options=$(echo "$options" | sed -e 's/[,]*log-file=[^,]*//' \
-e 's/[,]*log-level=[^,]*//' \
-e 's/[,]*volume-name=[^,]*//' \