From a5b24c22a865f2ea3ee389b9d0a235bf7d93f5a6 Mon Sep 17 00:00:00 2001 From: Xiao-Yong Jin Date: Wed, 14 Mar 2018 20:17:10 -0500 Subject: mount, 9pfuse: detect macports installed osxfuse MacPorts installs osxfuse under /opt/local. --- bin/mount | 1 + src/cmd/9pfuse/fuse.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/bin/mount b/bin/mount index a343a532..0fbb1bfd 100755 --- a/bin/mount +++ b/bin/mount @@ -26,6 +26,7 @@ case Darwin test -d /System/Library/Extensions/fusefs.kext || test -d /Library/Filesystems/osxfuse.fs/Contents/Extensions/$version/osxfuse.kext || test -d /Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext || + test -d /opt/local/Library/Filesystems/osxfuse.fs || test -d /Library/Filesystems/fusefs.fs/Support/fusefs.kext) exec 9pfuse $1 $2 echo 'don''t know how to mount (no fuse)' >[1=2] diff --git a/src/cmd/9pfuse/fuse.c b/src/cmd/9pfuse/fuse.c index b84663e9..66f66065 100644 --- a/src/cmd/9pfuse/fuse.c +++ b/src/cmd/9pfuse/fuse.c @@ -810,6 +810,8 @@ mountfuse(char *mtpt) "/Support/load_osxfusefs"), 0) < 0 && access((v="osxfuse", f="/Library/Filesystems/osxfuse.fs" "/Contents/Resources/load_osxfuse"), 0) < 0 && + access((v="osxfuse", f="/opt/local/Library/Filesystems/osxfuse.fs" + "/Contents/Resources/load_osxfuse"), 0) < 0 && access((v="fusefs", f="/System/Library/Extensions/fusefs.kext" "/Contents/Resources/load_fusefs"), 0) < 0 && access(f="/Library/Extensions/fusefs.kext" @@ -874,6 +876,12 @@ mountfuse(char *mtpt) execl("/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse", "mount_osxfuse", buf, mtpt, nil); + /* OSXFUSE >=3.3 from macports */ + putenv("MOUNT_OSXFUSE_DAEMON_PATH", + "/opt/local/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse"); + execl("/opt/local/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse", + "mount_osxfuse", buf, mtpt, nil); + /* Lion OSXFUSE location */ putenv("MOUNT_FUSEFS_DAEMON_PATH", "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs"); -- cgit v1.2.3