merge bugfix branch up to 2.6.4

diff --git a/ChangeLog b/ChangeLog
index 8ad2462e369f4744cca86ebd6bfbb523002c0f85..12e78a695e49bb908a6c33b32986fb3f0ffc7a4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,12 +24,19 @@
 
        * Replace utils/mount.fuse "sh" script with a "C" program
 
+2007-04-15  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Add -lulockmgr to compilation comment in fusexmp_fh.c
+
 2007-04-05  Miklos Szeredi <miklos@szeredi.hu>
 
        * Check for iconv.  Patch by Csaba Henk
 
        * Add direct umounting
 
+       * Use "fusectl" as the device for the fusectl filesystem.  Debian
+       Bug#417945.  Reported by Laurent Bonnaud
+
 2007-04-01  Csaba Henk <csaba.henk@creo.hu>
 
        * Fix some FreeBSD related macros.

diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index 8daee0308259ff1ba940561e801eea14111d3844..daacb712e19b303078ffb616758207652e81c7b3 100644 (file)
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -5,7 +5,7 @@
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
 
-    gcc -Wall `pkg-config fuse --cflags --libs` fusexmp_fh.c -o fusexmp_fh
+    gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
 */
 
 #define FUSE_USE_VERSION 26

diff --git a/util/init_script b/util/init_script
index 0ca395f9c583bffadee658c880d203d2de0735c5..2d1bd29f8aa69f7035b166b9830b25433c7e14ac 100755 (executable)
--- a/util/init_script
+++ b/util/init_script
@@ -28,7 +28,7 @@ case "$1" in
        fi
        if grep -qw fusectl /proc/filesystems && \
           ! grep -qw $MOUNTPOINT /proc/mounts; then
-               mount -t fusectl none $MOUNTPOINT >/dev/null 2>&1 || \
+               mount -t fusectl fusectl $MOUNTPOINT >/dev/null 2>&1 || \
                        error "mounting control filesystem"
        fi
        echo "done."