fix

diff --git a/ChangeLog b/ChangeLog
index 85922f7937f36e1ffa77b2491d3145d633a59cbb..0729da768a5766e56405ccc05cefdfaf2de606a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-20  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Remove '--enable-auto-modprobe' configure flag.  Module
+       auto-loading is now handled by the kernel.
+
 2005-09-15  Miklos Szeredi <miklos@szeredi.hu>
 
        * Install UDEV rule file, so /dev/fuse is created with mode 0666.

diff --git a/configure.in b/configure.in
index 5a8bc2f6883521a2691f3ce6c55be11c7482c3bc..7553c201b77c98b81792a6907c17be79ff0df0dd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -26,8 +26,6 @@ AC_ARG_ENABLE(util,
        [  --enable-util           Compile with util ])
 AC_ARG_ENABLE(example,
        [  --enable-example        Compile with examples ])
-AC_ARG_ENABLE(auto-modprobe,
-       [  --enable-auto-modprobe  Automatically insert kernel module])
 
 subdirs2="include"
 
@@ -44,10 +42,6 @@ fi
 if test "$enable_example" != "no"; then
        subdirs2="$subdirs2 example";
 fi
-if test "$enable_auto_modprobe" = "yes"; then
-       AC_DEFINE(AUTO_MODPROBE, 1, [Automatically insert kernel module])
-fi
-
 AC_CHECK_FUNCS([setxattr])
 AC_CHECK_MEMBERS([struct stat.st_atim])
 

diff --git a/util/fusermount.c b/util/fusermount.c
index 03760dd46581be05546994e4b8f670bc40c80d7c..4c92b468a0f3ebac520136970f9cbda98c592f53 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -779,35 +779,7 @@ static int try_open_fuse_device(char **devp)
 
 static int open_fuse_device(char **devp)
 {
-    int fd;
-
-    if (1
-#ifndef AUTO_MODPROBE
-        && getuid() == 0
-#endif
-        ) {
-        int status;
-        pid_t pid;
-
-        fd = try_open_fuse_device(devp);
-        if (fd >= 0)
-            return fd;
-
-#ifndef USE_UCLIBC
-        pid = fork();
-#else
-        pid = vfork();
-#endif
-        if (pid == 0) {
-            setuid(0);
-            execl("/sbin/modprobe", "/sbin/modprobe", "fuse", NULL);
-            exit(1);
-        }
-        if (pid != -1)
-            waitpid(pid, &status, 0);
-    }
-
-    fd = try_open_fuse_device(devp);
+    int fd = try_open_fuse_device(devp);
     if (fd >= 0)
         return fd;