plan9port

commit 6654bd74cbcac31835b75cc473132c9a844073e4
parent d28cfee19e748c6a1fffa1ef2eb37ec3ea0fadd0
Author: rsc <devnull@localhost>
Date:   Wed, 20 Jun 2007 00:10:03 +0000

more macfuse path nonsense

Diffstat:
M
src/cmd/9pfuse/fuse.c
 | 
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/cmd/9pfuse/fuse.c b/src/cmd/9pfuse/fuse.c
@@ -838,8 +838,15 @@ mountfuse(char *mtpt)
 	if(pid == 0){
 		snprint(buf, sizeof buf, "%d", fd);
 		putenv("MOUNT_FUSEFS_CALL_BY_LIB", "");
+		/*
+		 * Different versions of MacFUSE put the
+		 * mount_fusefs binary in different places.
+		 * Try both.
+		 */
 		execl("/System/Library/Filesystems/fusefs.fs/mount_fusefs",
 			"mount_fusefs", buf, mtpt, nil);
+		execl("/System/Library/Filesystems/fusefs.fs/Support/mount_fusefs",
+			"mount_fusefs", buf, mtpt, nil);
 		fprint(2, "exec mount_fusefs: %r\n");
 		_exit(1);
 	}