From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 27 Apr 2007 19:24:35 +0000 (+0000)
Subject: merge bugfix branch up to 2.6.4
X-Git-Tag: fuse_2_7_0_rc1~6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d2e5f49ba48c69e6d771a8f3d97e3706261347a2;p=qemu-gpiodev%2Flibfuse.git

merge bugfix branch up to 2.6.4
---

diff --git a/ChangeLog b/ChangeLog
index 8ad2462..12e78a6 100644
--- 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 8daee03..daacb71 100644
--- 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 0ca395f..2d1bd29 100755
--- 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."