View | Details | Raw Unified | Return to bug 118758
Collapse All | Expand All

(-)fusefs-kmod/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	fusefs
8
PORTNAME=	fusefs
9
DISTVERSION=	0.3.9-pre1
9
DISTVERSION=	0.3.9-pre1
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=	sysutils kld
11
CATEGORIES=	sysutils kld
12
MASTER_SITES=	http://fuse4bsd.creo.hu/downloads/ \
12
MASTER_SITES=	http://fuse4bsd.creo.hu/downloads/ \
13
		http://am-productions.biz/docs/
13
		http://am-productions.biz/docs/
(-)fusefs-kmod/files/fusefs.in (+18 lines)
Lines 25-37 Link Here
25
25
26
fusefs_start()
26
fusefs_start()
27
{
27
{
28
	if kldstat | grep -q fuse\\.ko; then
29
		echo "${name} is already running."
30
		return 0
31
	fi
28
	echo "Starting ${name}."
32
	echo "Starting ${name}."
29
	kldload $kmod
33
	kldload $kmod
30
}
34
}
31
35
32
fusefs_stop()
36
fusefs_stop()
33
{
37
{
38
	if ! kldstat | grep -q fuse\\.ko; then
39
		echo "${name} is not running."
40
		return 1
41
	fi
34
	echo "Stopping ${name}."
42
	echo "Stopping ${name}."
43
# Unmount FUSE filesystems in reverse order (in case they are nested) with
44
# a delay of one second after, to allow 'umount' finish.
45
	mount | sed -e '1!G;h;$!d' | while read dev d1 mountpoint d2; do
46
		case "$dev" in
47
		/dev/fuse[0-9]*)
48
			echo "fusefs: unmounting ${mountpoint}."
49
			umount $mountpoint ; sleep 1
50
			;;
51
		esac
52
	done
35
	kldunload $kmod
53
	kldunload $kmod
36
}
54
}
37
load_rc_config $name
55
load_rc_config $name
(-)fusefs-kmod/files/patch-fuse_io.c (+11 lines)
Added Link Here
1
--- fuse_module/fuse_io.c.orig	Tue Jun 19 09:35:22 2007
2
+++ fuse_module/fuse_io.c	Thu Dec 13 02:46:05 2007
3
@@ -148,7 +148,7 @@
4
 	}
5
 
6
 	if (uio->uio_resid == 0)
7
-		return (0);
8
+		goto out;
9
 
10
 	if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {
11
 		if ((err = VOP_GETATTR(vp, &va, cred, td)))
(-)fusefs-kmod/files/patch-mount_fusefs-mount_fusefs.c (-3 / +13 lines)
Lines 1-6 Link Here
1
--- mount_fusefs/mount_fusefs.c	Sat Jul 14 13:12:09 2007
1
--- mount_fusefs/mount_fusefs.c.orig	Tue Jun 19 09:35:22 2007
2
+++ mount_fusefs/mount_fusefs.c	Sat Jul 14 13:12:09 2007
2
+++ mount_fusefs/mount_fusefs.c	Thu Dec 13 02:44:12 2007
3
@@ -469,7 +469,8 @@ showversion(void)
3
@@ -70,6 +70,8 @@
4
 	{ "user_id=",            0, 0x00, 1 },
5
 	{ "group_id=",           0, 0x00, 1 },
6
 	{ "large_read",          0, 0x00, 1 },
7
+	/* "nonempty", just the first two chars are stripped off during parsing */
8
+	{ "nempty",              0, 0x00, 1 },
9
 	MOPT_STDOPTS,
10
 	MOPT_END
11
 };
12
@@ -469,7 +471,8 @@
4
 int
13
 int
5
 init_backgrounded(void)
14
 init_backgrounded(void)
6
 {
15
 {
Lines 9-11 Link Here
9
+	size_t len;
18
+	size_t len;
10
 
19
 
11
 	len = sizeof(ibg);
20
 	len = sizeof(ibg);
21
 
(-)fusefs-kmod/files/pkg-message.in (+5 lines)
Lines 12-15 Link Here
12
/etc/fstab with the "late" parameter. This requires a symlink in /usr/sbin
12
/etc/fstab with the "late" parameter. This requires a symlink in /usr/sbin
13
named "mount_<fstype>", which is not created by all the fusefs ports.
13
named "mount_<fstype>", which is not created by all the fusefs ports.
14
14
15
Note that the rc.d script will unmount all fuse filesystems when called with
16
"stop", so it can unload the kernel module, and as a temporary workaround to
17
flush cache in drivers like NTFS-3G (sysutils/fusefs-ntfs) at shutdown (until
18
a proper solution is implemented).
19
15
==============================================================================
20
==============================================================================

Return to bug 118758