summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/zfs-fuse/ChangeLog6
-rw-r--r--sys-fs/zfs-fuse/files/9999/zfs-fuse.rc6
-rw-r--r--sys-fs/zfs-fuse/zfs-fuse-9999.ebuild8
3 files changed, 15 insertions, 5 deletions
diff --git a/sys-fs/zfs-fuse/ChangeLog b/sys-fs/zfs-fuse/ChangeLog
index c7131ce25917..0410ead42209 100644
--- a/sys-fs/zfs-fuse/ChangeLog
+++ b/sys-fs/zfs-fuse/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-fs/zfs-fuse
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.5 2008/09/25 14:32:16 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/ChangeLog,v 1.6 2008/09/25 16:29:02 trapni Exp $
+
+ 25 Sep 2008; Christian Parpart <trapni@gentoo.org> files/9999/zfs-fuse.rc,
+ zfs-fuse-9999.ebuild:
+ improved rc handling
*zfs-fuse-9999 (25 Sep 2008)
diff --git a/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc b/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc
index f88c73e21dee..f2ae98c7e4bd 100644
--- a/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc
+++ b/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc
@@ -1,14 +1,14 @@
#!/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/9999/zfs-fuse.rc,v 1.1 2008/09/25 14:32:17 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/files/9999/zfs-fuse.rc,v 1.2 2008/09/25 16:29:02 trapni Exp $
depend() {
need localmount
before net
}
-PIDFILE="/var/run/zfs-fuse.pid"
+PIDFILE="/var/run/zfs/zfs-fuse.pid"
EXEFILE="/usr/sbin/zfs-fuse"
checksystem() {
@@ -19,7 +19,7 @@ start() {
ebegin "Starting ZFS-FUSE"
checksystem || return 1
start-stop-daemon --start --exec ${EXEFILE} \
- --pidfile ${PIDFILE} --user daemon --group disk
+ --user daemon --group disk -- --pidfile ${PIDFILE}
rv=$?
eend $rv
diff --git a/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild b/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild
index f490e3f64e9b..e7731d5045bd 100644
--- a/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild
+++ b/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild,v 1.1 2008/09/25 14:32:16 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-fuse/zfs-fuse-9999.ebuild,v 1.2 2008/09/25 16:29:02 trapni Exp $
IUSE="doc debug"
@@ -56,6 +56,12 @@ src_install() {
newinitd "${FILESDIR}/${PV}/${PN}.rc" "zfs-fuse" || die
+ keepdir /var/lock/zfs || die
+ fowners daemon.disk /var/lock/zfs || die
+
+ keepdir /var/run/zfs || die
+ fowners daemon.disk /var/run/zfs || die
+
cd "${WORKDIR}/trunk" || die
dodoc CHANGES || die