2 files changed, 9 insertions, 1 deletions
diff --git a/xlators/mount/fuse/utils/mount.glusterfs.in b/xlators/mount/fuse/utils/mount.glusterfs.in
index 99513b4e8c3..ac4d94cb743 100755
--- a/xlators/mount/fuse/utils/mount.glusterfs.in
+++ b/xlators/mount/fuse/utils/mount.glusterfs.in
@@ -776,6 +776,7 @@ main ()
             [ $(echo $volume_str_temp | grep -c "/") -eq 1 ] &&
                     [ "$volume_id_temp" != "snaps" ]  && {
                 volume_id=$volume_id_temp;
+                [ ${first_char} = '/' ] && volume_id=/$volume_id;
                 subdir_mount=$(echo "$volume_str_temp" | cut -f2- -d '/');
             }
         }
diff --git a/xlators/mount/fuse/utils/mount_glusterfs.in b/xlators/mount/fuse/utils/mount_glusterfs.in
index d43fc97d084..3a5feb606d7 100755
--- a/xlators/mount/fuse/utils/mount_glusterfs.in
+++ b/xlators/mount/fuse/utils/mount_glusterfs.in
@@ -469,6 +469,7 @@ parse_options()
 
 main ()
 {
+#if !defined(__FreeBSD__)
     ## `mount` on OSX specifies options as first argument
     echo $1|grep -q -- "-o"
     if [ $? -eq 0 ];  then
@@ -478,7 +479,7 @@ main ()
         volfile_loc=$1
         mount_point=$2
     fi
-
+#endif /* __FreeBSD__ */
     while getopts "Vo:h" opt; do
         case "${opt}" in
             o)
@@ -499,6 +500,12 @@ main ()
         esac
     done
 
+#ifdef __FreeBSD__
+    shift $((OPTIND - 1))
+    volfile_loc="$1"
+    mount_point="$2"
+#endif /* __FreeBSD__ */
+
     [ -r "$volfile_loc" ] || {
         # '%' included to support ipv6 link local addresses
         server_ip=$(echo "$volfile_loc" | sed -n 's/\([a-zA-Z0-9:%.\-]*\):.*/\1/p');