diff options
author | 2005-09-20 11:36:32 +0000 | |
---|---|---|
committer | 2005-09-20 11:36:32 +0000 | |
commit | 670d07a4dd53af54df031b9a204cb1641463ae8f (patch) | |
tree | 29c76d62f56d8eb50d3722134e36964195120790 | |
parent | d51fca1af73903f843077d2c284794e100f4da35 (diff) |
fix
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | util/fusermount.c | 30 |
3 files changed, 6 insertions, 35 deletions
@@ -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 5a8bc2f..7553c20 100644 --- 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 03760dd..4c92b46 100644 --- 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; |