Run as "root" instead of "daemon" wrt #242390 by Stefan G. Weichinger.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 2 insertions, 78 deletions

diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch
deleted file mode 100644
index 770c1ae9dcf3..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_zdb_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch
deleted file mode 100644
index 3b5d656f5744..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_zfs-fuse_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
diff --git a/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch b/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch
deleted file mode 100644
index d87979d4391c..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/fix_ztest_path.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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`"
diff --git a/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc b/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc
deleted file mode 100644
index 94648c91fa49..000000000000
--- a/sys-fs/zfs-fuse/files/0.5.0/zfs-fuse.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/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 $?
-}
diff --git a/sys-fs/zfs-fuse/files/zfs-fuse.rc b/sys-fs/zfs-fuse/files/zfs-fuse
index 415ea99fc429..b16c885182a0 100644
--- a/sys-fs/zfs-fuse/files/zfs-fuse.rc
+++ b/sys-fs/zfs-fuse/files/zfs-fuse
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/zfs-fuse.rc,v 1.3 2010/06/05 23:46:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/zfs-fuse,v 1.1 2010/06/22 20:13:43 ssuominen Exp $
 
 depend() {
 	before net
@@ -19,7 +19,7 @@ start() {
 	ebegin "Starting ZFS-FUSE"
 	checksystem || return 1
 	start-stop-daemon --start --exec ${EXEFILE} \
-        	--user daemon --group disk -- --pidfile ${PIDFILE}
+        	--user root --group disk -- --pidfile ${PIDFILE}
 	rv=$?
 	eend $rv