summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarshavardhana Ranganath <harsha@gluster.com>2009-06-25 23:12:00 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-06-29 10:15:13 -0700
commit75da95d8419dd209d879194e1b73a6190129a504 (patch)
tree1cd191c266edf462af58148e378e71526c306948
parent66224718ab57238e16b30d8b461c380d64df237c (diff)
Added new options for log-server and log-server-port
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
-rwxr-xr-xxlators/mount/fuse/utils/mount.glusterfs.in18
1 files changed, 16 insertions, 2 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 13d6ea5646c..7d30ee13a32 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# (C) 2006, 2007, 2008 Z RESEARCH Inc. <http://www.zresearch.com>
#
# This program is free software; you can redistribute it and/or
@@ -100,6 +100,14 @@ function start_glusterfs ()
cmd_line=$(echo "$cmd_line --volfile=$volfile_loc");
fi
+ if [ -n "$log_server" ]; then
+ if [ -n "$log_server_port" ]; then
+ cmd_line=$(echo "$cmd_line \
+--log-server=$log_server \
+--log-server-port=$log_server_port");
+ fi
+ fi
+
if [ -n "$volume_name" ]; then
cmd_line=$(echo "$cmd_line --volume-name=$volume_name");
fi
@@ -132,6 +140,10 @@ function main ()
server_port=$(echo "$options" | sed -n 's/.*server-port=\([^,]*\).*/\1/p');
+ log_server=$(echo "$options" | sed -n 's/.*log-server=\([^,]*\).*/\1/p');
+
+ log_server_port=$(echo "$options" | sed -n 's/.*log-server-port=\([^,]*\).*/\1/p');
+
volfile_loc="$1";
[ -r "$volfile_loc" ] || {
@@ -160,7 +172,9 @@ function main ()
-e 's/[,]*volfile-check=[^,]*//' \
-e 's/[,]*transport=[^,]*//' \
-e 's/[,]*server-port=[^,]*//' \
- -e 's/[,]*volume-id=[^,]*//');
+ -e 's/[,]*volume-id=[^,]*//' \
+ -e 's/[,]*log-server=[^,]*//' \
+ -e 's/[,]*log-server-port=[^,]*//');
# following line is product of love towards sed
# $2=$(echo "$@" | sed -n 's/[^ ]* \([^ ]*\).*/\1/p');