o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mount, 9pfuse: detect macports installed osxfuse

Browse source 
MacPorts installs osxfuse under /opt/local.
This commit is contained in:
Xiao-Yong Jin 2018-03-14 20:17:10 -05:00 • committed by David du Colombier
parent 4ebaf18e92
commit a5b24c22a8
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bin/mount
View file

@ -26,6 +26,7 @@ case Darwin
test -d /System/Library/Extensions/fusefs.kext || test -d /System/Library/Extensions/fusefs.kext ||
test -d /Library/Filesystems/osxfuse.fs/Contents/Extensions/$version/osxfuse.kext || test -d /Library/Filesystems/osxfuse.fs/Contents/Extensions/$version/osxfuse.kext ||
test -d /Library/Filesystems/osxfusefs.fs/Support/osxfusefs.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) test -d /Library/Filesystems/fusefs.fs/Support/fusefs.kext)
exec 9pfuse $1 $2 exec 9pfuse $1 $2
echo 'don''t know how to mount (no fuse)' >[1=2] echo 'don''t know how to mount (no fuse)' >[1=2]

8
src/cmd/9pfuse/fuse.c
View file

@ -810,6 +810,8 @@ mountfuse(char *mtpt)
"/Support/load_osxfusefs"), 0) < 0 && "/Support/load_osxfusefs"), 0) < 0 &&
access((v="osxfuse", f="/Library/Filesystems/osxfuse.fs" access((v="osxfuse", f="/Library/Filesystems/osxfuse.fs"
"/Contents/Resources/load_osxfuse"), 0) < 0 && "/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" access((v="fusefs", f="/System/Library/Extensions/fusefs.kext"
"/Contents/Resources/load_fusefs"), 0) < 0 && "/Contents/Resources/load_fusefs"), 0) < 0 &&
access(f="/Library/Extensions/fusefs.kext" access(f="/Library/Extensions/fusefs.kext"
@ -874,6 +876,12 @@ mountfuse(char *mtpt)
execl("/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse", execl("/Library/Filesystems/osxfuse.fs/Contents/Resources/mount_osxfuse",
"mount_osxfuse", buf, mtpt, nil); "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 */ /* Lion OSXFUSE location */
putenv("MOUNT_FUSEFS_DAEMON_PATH", putenv("MOUNT_FUSEFS_DAEMON_PATH",
"/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs"); "/Library/Filesystems/osxfusefs.fs/Support/mount_osxfusefs");