From 1d5eb3682a90628a012467c6be197c15401ccba5 Mon Sep 17 00:00:00 2001
From: Daniel Morante <daniel@morante.net>
Date: Sun, 9 Aug 2020 21:30:45 -0400
Subject: FreeBSD patches for fuse mount utility

Change-Id: Ib2bac85c28905bb8997fbb64db2308f2a6f31720
Fixes: #1376
---
 contrib/fuse-lib/mount.c                    | 1 +
 xlators/mount/fuse/utils/mount_glusterfs.in | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c
index 351972ce3cf..06ff191f542 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -390,6 +390,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
         build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
         build_iovec (&iov, &iovlen, "volname", source, -1);
         build_iovec (&iov, &iovlen, "fd", fdstr, -1);
+        build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
         ret = nmount (iov, iovlen, mountflags);
 #else
         ret = mount (source, mountpoint, fstype, mountflags,
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');
-- 
cgit