Commit Diff

Commit:
a5b24c22a865f2ea3ee389b9d0a235bf7d93f5a6
From:
Xiao-Yong Jin <xjin@anl.gov>
Via:
David du Colombier <0intro@gmail.com>
Date:
Message:
mount, 9pfuse: detect macports installed osxfuse MacPorts installs osxfuse under /opt/local.
Actions:
Patch | Tree
commit - 4ebaf18e9234bf58aae7a5c47fc15ec4c80812b6
commit + a5b24c22a865f2ea3ee389b9d0a235bf7d93f5a6
blob - a343a532833d1ac1e5d01c7d7de989831568c3cc
blob + 0fbb1bfd59b5f07a97914a6e0219b0a2894492e8
--- bin/mount
+++ 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]
blob - b84663e99fad3889fcb3a2c73fe5bcfd43abe5d8
blob + 66f66065dfabd0fff17977956736d28e70684ba7
--- src/cmd/9pfuse/fuse.c
+++ src/cmd/9pfuse/fuse.c
@@ -809,6 +809,8 @@ mountfuse(char *mtpt)
 		if(access((v="osxfusefs", f="/Library/Filesystems/osxfusefs.fs"
 			"/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 &&
@@ -873,6 +875,12 @@ mountfuse(char *mtpt)
 			   "/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse");
 		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",