From: Miklos Szeredi <miklos@szeredi.hu>
Date: Sat, 30 Sep 2006 16:41:12 +0000 (+0000)
Subject: fusermount: revert modprobe change
X-Git-Tag: fuse_2_6_0_rc2~4
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=004a8c763ea66f91ed7a2a7ea9f28b4a16ba400c;p=qemu-gpiodev%2Flibfuse.git

fusermount: revert modprobe change
---

diff --git a/ChangeLog b/ChangeLog
index 942c2d9..9846bf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-30  Miklos Szeredi <miklos@szeredi.hu>
 
+	* fusermount: revert modprobe change (2006-08-18) since it
+	doesn't work reliably with udev
+
 	* Add support for block device backed filesystems.  This mode is
 	selected with the 'blkdev' option, which is privileged.
 
diff --git a/util/fusermount.c b/util/fusermount.c
index 1843f50..dc30fde 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -851,17 +851,7 @@ static int try_open_fuse_device(char **devp)
 
 static int open_fuse_device(char **devp)
 {
-    int fd;
-
-    if (getuid() == 0) {
-        fd = try_open_fuse_device(devp);
-        if (fd >= -1)
-            return fd;
-
-        system("modprobe fuse");
-    }
-
-    fd = try_open_fuse_device(devp);
+    int fd = try_open_fuse_device(devp);
     if (fd >= -1)
         return fd;