diff options
Diffstat (limited to 'xlators/mount/fuse/utils/mount_glusterfs.in')
| -rwxr-xr-x | xlators/mount/fuse/utils/mount_glusterfs.in | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in index 0f808c14b..b12b4e04e 100755 --- a/xlators/mount/fuse/utils/mount_glusterfs.in +++ b/xlators/mount/fuse/utils/mount_glusterfs.in @@ -25,11 +25,11 @@ _init () LOG_CRITICAL=CRITICAL; LOG_ERROR=ERROR; LOG_WARNING=WARNING; - LOG_NORMAL=NORMAL; + LOG_INFO=INFO; LOG_DEBUG=DEBUG; # set default log level to ERROR - log_level=$LOG_NORMAL; + log_level=$LOG_INFO; } start_glusterfs () @@ -43,8 +43,8 @@ start_glusterfs () "ERROR") log_level=$LOG_ERROR; ;; - "NORMAL") - log_level=$LOG_NORMAL; + "INFO") + log_level=$LOG_INFO; ;; "DEBUG") log_level=$LOG_DEBUG; @@ -59,8 +59,8 @@ start_glusterfs () log_level=$LOG_NONE; ;; *) - echo "invalid log level $log_level_str, using NORMAL"; - log_level=$LOG_NORMAL; + echo "invalid log level $log_level_str, using INFO"; + log_level=$LOG_INFO; ;; esac fi @@ -82,12 +82,10 @@ start_glusterfs () if [ -n "$transport" ]; then cmd_line=$(echo "$cmd_line \ --volfile-server=$server_ip \ ---volfile-server-port=$server_port \ --volfile-server-transport=$transport"); else cmd_line=$(echo "$cmd_line \ ---volfile-server=$server_ip \ ---volfile-server-port=$server_port"); +--volfile-server=$server_ip"); fi else cmd_line=$(echo "$cmd_line --volfile=$volfile_loc"); @@ -167,19 +165,15 @@ main () # TODO: use getopt. This is very much darwin specific volfile_loc="$1"; - while [ "$volfile_loc" == "-o" ] ; do + while [ "$volfile_loc" = "-o" ] ; do shift ; shift ; volfile_loc="$1"; done [ -r "$volfile_loc" ] || { - server_ip=$(echo "$volfile_loc" | sed -n 's/\([^\:]*\).*/\1/p'); - server_port=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p'); - [ -n "$server_port" ] || { - server_port="6996"; - } - + server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:.\-]*\):.*/\1/p'); + volume_id=$(echo "$volfile_loc" | sed -n 's/[a-zA-Z0-9:.\-]*:\(.*\)/\1/p'); volfile_loc=""; } # following line is product of love towards sed |