[gentoo-commits] gentoo-x86 commit in sys-fs/zfs-fuse/files/0.5.0: fix_zdb_path.patch fix_zfs-fuse_path.patch fix_ztest_path.patch zfs-fuse.rc

[gentoo-commits] gentoo-x86 commit in sys-fs/zfs-fuse/files/0.5.0: fix_zdb_path.patch fix_zfs-fuse_path.patch fix_ztest_path.patch zfs-fuse.rc

[Samuli Suominen (ssuominen)]

ssuominen    10/06/22 20:13:43

  Removed:              fix_zdb_path.patch fix_zfs-fuse_path.patch
                        fix_ztest_path.patch zfs-fuse.rc
  Log:
  Run as "root" instead of "daemon" wrt #242390 by Stefan G. Weichinger.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

[gentoo-commits] gentoo-x86 commit in sys-fs/zfs-fuse/files/0.5.0: fix_zdb_path.patch fix_zfs-fuse_path.patch fix_ztest_path.patch zfs-fuse.rc

[Christian Parpart (trapni)]

trapni      08/09/25 17:03:21

  Added:                fix_zdb_path.patch fix_zfs-fuse_path.patch
                        fix_ztest_path.patch zfs-fuse.rc
  Log:
  added 0.5.0 release
  (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64)

Revision  Changes    Path
1.1                  sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch?rev=1.1&content-type=text/plain

Index: fix_zdb_path.patch
===================================================================
--- a/src/cmd/ztest/ztest.c	2008-06-24 13:52:22.000000000 -0400
+++ b/src/cmd/ztest/ztest.c	2008-06-24 14:59:06.000000000 -0400
@@ -2844,7 +2844,7 @@
 	/* zfs-fuse: ztest is never installed, so zdb should be in ../zdb/ */
 	/* LINTED */
 	(void) sprintf(zdb,
-	    "../zdb/zdb -bc%s%s -U /tmp/zpool.cache -O %s %s",
+	    "/usr/sbin/zdb -bc%s%s -U -O %s %s",
 	    zopt_verbose >= 3 ? "s" : "",
 	    zopt_verbose >= 4 ? "v" : "",
 	    ztest_random(2) == 0 ? "pre" : "post", pool);



1.1                  sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch?rev=1.1&content-type=text/plain

Index: fix_zfs-fuse_path.patch
===================================================================
--- a/src/zfs-fuse/run.sh	2007-01-09 11:07:35.000000000 +0000
+++ b/src/zfs-fuse/run.sh	2007-01-09 11:45:05.000000000 +0000
@@ -1,5 +1,7 @@
 #!/bin/sh
-
+echo ""
+echo "On Gentoo ZFS-FUSE runs in debugging mode by default."
+echo "To run ZFS-FUSE without debugging please run /usr/bin/run-zfs-fuse"
 ulimit -c unlimited
-
-./zfs-fuse --no-daemon
+echo ""
+/usr/bin/run-zfs-fuse



1.1                  sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch?rev=1.1&content-type=text/plain

Index: fix_ztest_path.patch
===================================================================
--- a/src/cmd/ztest/runtest.sh	2007-01-09 11:07:35.000000000 +0000
+++ b/src/cmd/ztest/runtest.sh	2007-01-09 11:08:51.000000000 +0000
@@ -3,5 +3,5 @@ ulimit -c unlimited
 echo "Start date: `date`"
 #ZFS_DEBUG=on /usr/bin/time -v nice -n 20 ./ztest -V -T 86400 &> log.txt
 #/usr/bin/time -v nice -n 20 ./ztest -V -T 86400
-nice -n 20 ./ztest -V $* && echo Test successful
+nice -n 20 /usr/sbin/run-ztest -V $* && echo Test successful
 echo "End date: `date`"



1.1                  sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc?rev=1.1&content-type=text/plain

Index: zfs-fuse.rc
===================================================================
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc,v 1.1 2008/09/25 17:03:20 trapni Exp $

depend() {
	need localmount
	before net
}

PIDFILE="/var/run/zfs/zfs-fuse.pid"
EXEFILE="/usr/sbin/zfs-fuse"

checksystem() {
	return 0 # TODO
}

start() {
	ebegin "Starting ZFS-FUSE"
	checksystem || return 1
	start-stop-daemon --start --exec ${EXEFILE} \
        	--user daemon --group disk -- --pidfile ${PIDFILE}
	rv=$?
	eend $rv

	if [[ $rv -eq 0 ]]; then
		ebegin "Mounting ZFS filesystems"
		zfs mount -a
		eend $?
	fi
}

stop() {
	ebegin "Unmounting ZFS filesystems"
	zfs umount -f -a
	eend $?

	ebegin "Stopping ZFS-FUSE"
	checksystem || return 2
	start-stop-daemon --stop --pidfile ${PIDFILE} \
		--exec ${EXEFILE} --retry TERM/1/TERM/2/TERM/4/TERM/8/KILL
	eend $?
}