1 |
trapni 08/09/25 14:32:17 |
2 |
|
3 |
Added: fix_zdb_path.patch fix_zfs-fuse_path.patch |
4 |
fix_ztest_path.patch zfs-fuse.rc |
5 |
Log: |
6 |
added live ebuild to zfs-fuse |
7 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_zdb_path.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: fix_zdb_path.patch |
16 |
=================================================================== |
17 |
--- a/src/cmd/ztest/ztest.c 2008-06-24 13:52:22.000000000 -0400 |
18 |
+++ b/src/cmd/ztest/ztest.c 2008-06-24 14:59:06.000000000 -0400 |
19 |
@@ -2844,7 +2844,7 @@ |
20 |
/* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */ |
21 |
/* LINTED */ |
22 |
(void) sprintf(zdb, |
23 |
- "../zdb/zdb -bc%s%s -U /tmp/zpool.cache -O %s %s", |
24 |
+ "/usr/sbin/zdb -bc%s%s -U -O %s %s", |
25 |
zopt_verbose >= 3 ? "s" : "", |
26 |
zopt_verbose >= 4 ? "v" : "", |
27 |
ztest_random(2) == 0 ? "pre" : "post", pool); |
28 |
|
29 |
|
30 |
|
31 |
1.1 sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch |
32 |
|
33 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch?rev=1.1&view=markup |
34 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_zfs-fuse_path.patch?rev=1.1&content-type=text/plain |
35 |
|
36 |
Index: fix_zfs-fuse_path.patch |
37 |
=================================================================== |
38 |
--- a/src/zfs-fuse/run.sh 2007-01-09 11:07:35.000000000 +0000 |
39 |
+++ b/src/zfs-fuse/run.sh 2007-01-09 11:45:05.000000000 +0000 |
40 |
@@ -1,5 +1,7 @@ |
41 |
#!/bin/sh |
42 |
- |
43 |
+echo "" |
44 |
+echo "On Gentoo ZFS-FUSE runs in debugging mode by default." |
45 |
+echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse" |
46 |
ulimit -c unlimited |
47 |
- |
48 |
-./zfs-fuse --no-daemon |
49 |
+echo "" |
50 |
+/usr/bin/run-zfs-fuse |
51 |
|
52 |
|
53 |
|
54 |
1.1 sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch |
55 |
|
56 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch?rev=1.1&view=markup |
57 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/fix_ztest_path.patch?rev=1.1&content-type=text/plain |
58 |
|
59 |
Index: fix_ztest_path.patch |
60 |
=================================================================== |
61 |
--- a/src/cmd/ztest/runtest.sh 2007-01-09 11:07:35.000000000 +0000 |
62 |
+++ b/src/cmd/ztest/runtest.sh 2007-01-09 11:08:51.000000000 +0000 |
63 |
@@ -3,5 +3,5 @@ ulimit -c unlimited |
64 |
echo "Start date: `date`" |
65 |
#ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt |
66 |
#/usr/bin/time -v nice -n 20 ./ztest -V -T 86400 |
67 |
-nice -n 20 ./ztest -V $* && echo Test successful |
68 |
+nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful |
69 |
echo "End date: `date`" |
70 |
|
71 |
|
72 |
|
73 |
1.1 sys-fs/zfs-fuse/files/9999/zfs-fuse.rc |
74 |
|
75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc?rev=1.1&view=markup |
76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc?rev=1.1&content-type=text/plain |
77 |
|
78 |
Index: zfs-fuse.rc |
79 |
=================================================================== |
80 |
#!/sbin/runscript |
81 |
# Copyright 1999-2007 Gentoo Foundation |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc,v 1.1 2008/09/25 14:32:17 trapni Exp $ |
84 |
|
85 |
depend() { |
86 |
need localmount |
87 |
before net |
88 |
} |
89 |
|
90 |
PIDFILE="/var/run/zfs-fuse.pid" |
91 |
EXEFILE="/usr/sbin/zfs-fuse" |
92 |
|
93 |
checksystem() { |
94 |
return 0 # TODO |
95 |
} |
96 |
|
97 |
start() { |
98 |
ebegin "Starting ZFS-FUSE" |
99 |
checksystem || return 1 |
100 |
start-stop-daemon --start --exec ${EXEFILE} \ |
101 |
--pidfile ${PIDFILE} --user daemon --group disk |
102 |
rv=$? |
103 |
eend $rv |
104 |
|
105 |
if [[ $rv -eq 0 ]]; then |
106 |
ebegin "Mounting ZFS filesystems" |
107 |
zfs mount -a |
108 |
eend $? |
109 |
fi |
110 |
} |
111 |
|
112 |
stop() { |
113 |
ebegin "Unmounting ZFS filesystems" |
114 |
zfs umount -f -a |
115 |
eend $? |
116 |
|
117 |
ebegin "Stopping ZFS-FUSE" |
118 |
checksystem || return 2 |
119 |
start-stop-daemon --stop --pidfile ${PIDFILE} \ |
120 |
--exec ${EXEFILE} --retry TERM/1/TERM/2/TERM/4/TERM/8/KILL |
121 |
eend $? |
122 |
} |