Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 0 deletions

diff --git a/bin/mount b/bin/mount
index 79b974f7..0fbb1bfd 100755
--- a/bin/mount
+++ b/bin/mount
@@ -19,11 +19,14 @@ case FreeBSD
 		exec 9pfuse $1 $2
 	echo 'don''t know how to mount (no fuse)' >[1=2]
 case Darwin
+	version=`{sw_vers -productVersion|cut -d. -f1,2}
 	if(sysctl fuse.version >[2]/dev/null |9 grep -si 'fuse.version' ||
 	   sysctl macfuse.version.number >[2]/dev/null |9 grep -si 'fuse.version' ||
 	   sysctl osxfuse.version.number >[2]/dev/null |9 grep -si 'fuse.version' ||
 	   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]