fix

diff --git a/ChangeLog b/ChangeLog
index c2a8a983ffeb7745c5d7e56a5bd93fa40ddeb2aa..48024ffacd6e6c0354f1ede2c1cfdae22daf75bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-29  Miklos Szeredi <miklos@szeredi.hu>
+
+       * fusermount: fix error message, when unable to open /dev/fuse.
+       Report by Balázs Pozsár
+
 2005-09-28  Miklos Szeredi <miklos@szeredi.hu>
 
        * UClibc fixes from Christian Magnusson

diff --git a/util/fusermount.c b/util/fusermount.c
index 87dfaa8cd7e744e62f3f71a22ca22298844b59c6..0330cf956f2e593a18d1dda037270c56a08f86e3 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -774,18 +774,20 @@ static int try_open(const char *dev, char **devp, int silent)
 static int try_open_fuse_device(char **devp)
 {
     int fd;
+    int err;
 
     drop_privs();
-    fd = try_open(FUSE_DEV_NEW, devp, 1);
+    fd = try_open(FUSE_DEV_NEW, devp, 0);
     restore_privs();
     if (fd >= 0)
         return fd;
 
+    err = fd;
     fd = try_open(FUSE_DEV_OLD, devp, 1);
     if (fd >= 0)
         return fd;
 
-    return -1;
+    return err;
 }
 
 static int open_fuse_device(char **devp)
@@ -794,8 +796,10 @@ static int open_fuse_device(char **devp)
     if (fd >= 0)
         return fd;
 
-    fprintf(stderr, "%s: fuse device not found, try 'modprobe fuse' first\n",
-            progname);
+    if (fd == -2)
+        fprintf(stderr,
+                "%s: fuse device not found, try 'modprobe fuse' first\n",
+                progname);
     return -1;
 }