Commit Diff

Commit:
4c65127bbe5a3a1866ae005be9d5e98d79165a15
From:
rsc <devnull@localhost>
Date:
Message:
google moved the fusefs.kext path
Actions:
Patch | Tree
commit - 47964cbc7b1409edc4908f199912e25d17b63b55
commit + 4c65127bbe5a3a1866ae005be9d5e98d79165a15
blob - 6422c28cd6adba6da4be2c853be8bbaf66586305
blob + 513d38c99d1afa7a807f41f61ea93c9ed606d72b
--- src/cmd/9pfuse/fuse.c
+++ src/cmd/9pfuse/fuse.c
@@ -797,11 +797,18 @@ mountfuse(char *mtpt)
 	int i, pid, fd, r;
 	char buf[20];
 	struct vfsconf vfs;
+	char *f;
 	
 	if(getvfsbyname("fusefs", &vfs) < 0){
-		if((r=system("/System/Library/Extensions/fusefs.kext"
-				"/Contents/Resources/load_fusefs")) < 0){
-			werrstr("load fusefs: %r");
+		if(access(f="/System/Library/Extensions/fusefs.kext"
+			"/Contents/Resources/load_fusefs", 0) < 0 &&
+		   access(f="/Library/Extensions/fusefs.kext"
+		   	"/Contents/Resources/load_fusefs", 0) < 0){
+		   	werrstr("cannot find load_fusefs");
+		   	return -1;
+		}
+		if((r=system(f)) < 0){
+			werrstr("%s: %r", f);
 			return -1;
 		}
 		if(r != 0){