improved rc handling

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 18 insertions, 8 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/Manifest b/sys-fs/zfs-fuse/Manifest
index ce6cbd412e85..2f4ffc669411 100644
--- a/sys-fs/zfs-fuse/Manifest
+++ b/sys-fs/zfs-fuse/Manifest
@@ -1,7 +1,7 @@
 AUX 9999/fix_zdb_path.patch 483 RMD160 e212d2a3b69e75a3fe7ee8085763d681b9058270 SHA1 1e78f4f8b4286626642d8393d3f75d0689f47f50 SHA256 d4cef9ffd277c699360a7f8a1b25503a89d661ecc8285f80ca1e8cc30172ee84
 AUX 9999/fix_zfs-fuse_path.patch 378 RMD160 9f1f1692e5fbbc6ea29c7a5d7284bc75593bc3a4 SHA1 f49abfca781065a21259cae422bcf7149e169040 SHA256 42df1294e8801330f848261024d29b2e8f51b860527629a010b00b1ea89f7dd4
 AUX 9999/fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
-AUX 9999/zfs-fuse.rc 907 RMD160 8f4327d83e2e91929867b006c5ef7385063db09b SHA1 308ce937f3e7c6f4c9585a3d377407c3248b75e4 SHA256 8e022ad8eed575bc203aaffdfcc5ba976851fb0f669f1b00e313fe0b5ed07d59
+AUX 9999/zfs-fuse.rc 914 RMD160 de00ff4921ba8eb11621d2375745caa45715e01c SHA1 c99d218eae02384298e2ad93439b30d57cc4e276 SHA256 8481af9b8faa800c8582a0776e65f0b9492341a7ab80a9f57873532fdb2f5f38
 AUX zfs-fuse-0.4.0_beta1-fix_zdb_path.patch 510 RMD160 7a20f11836d11dc131a1e5227c8b8e66cdfa8f2d SHA1 39645ff69b525d1b177bd890d58730f23c5774fa SHA256 9764181601d95d58d857d99754d28bdaa919bd46ad4e8381d72a3c96414d967d
 AUX zfs-fuse-0.4.0_beta1-fix_zfs-fuse_path.patch 366 RMD160 c9a877d85a9baf48cd46ca6e48bd88ef693275f6 SHA1 27d1589c18b28dfc53c4d2297248e6389413fb57 SHA256 f9917fffcbfb75cda3adcb51d08779fa6e59ad174007fd5069b65d2976935917
 AUX zfs-fuse-0.4.0_beta1-fix_ztest_path.patch 458 RMD160 085918e132c4103b3ac2c4208d4d915b8b423622 SHA1 9fb7685ed350b8aac86484d51d6bb8ccf8473a92 SHA256 d6b69995ea21ef2f556ff330f0bf25734445341b8f2b6f51ae68ce19e22ec9c8
@@ -11,6 +11,6 @@ DIST zfs-fuse-0.4.0_beta1.tar.bz2 606593 RMD160 93c4aea550f3b55d39c2657f90e863ab
 EBUILD zfs-fuse-0.4.0_beta1-r1.ebuild 2465 RMD160 9bcbc1a35c5b0bee59c5c4895e404653b9138552 SHA1 5be260042cf1f1389a809a31bfa848dc96d227cc SHA256 fa69522e8556ce68354aba5293922ca9c7919f6f83d2e57c80adfab596e82719
 EBUILD zfs-fuse-0.4.0_beta1-r2.ebuild 2487 RMD160 5a431138933213e45dfa8e93ee77877f7df204c7 SHA1 80d12ec5e7ce99d641ffcf2351c5f392fef9fbbf SHA256 cbf4130e75520b5ee892f49f93bbb960a7b1e39f801982fd300301c30268ea79
 EBUILD zfs-fuse-0.4.0_beta1.ebuild 2484 RMD160 0b0bc4f109f8851ef57b4bb053178e97e5789308 SHA1 7b2c7e529dd723ab070a04f6a6b382f44f308119 SHA256 913835c0843117413f1ca41abd384ef4828c83d32010b86ba35e11cd4c5f4111
-EBUILD zfs-fuse-9999.ebuild 2496 RMD160 5e3632414d95fc16dcb42750d031542710046dba SHA1 1e71c063738363a92cff1a3fa4e4282cf87a4cc2 SHA256 0fe1f2f5c2bda374702f04d7edfcd2cabfaccd80b3e92bdbefa426a5799207d9
-MISC ChangeLog 1039 RMD160 b07ce9aa4ecc9c3527be28f7d503c683e620837a SHA1 31f6ffea47668bd31646b640b1bd01e310511a57 SHA256 bdf258d6c255b77fc2823e76af8181352d959f8563e62756486f1fc3be9bd3b3
+EBUILD zfs-fuse-9999.ebuild 2640 RMD160 40ccace931739b361c4a22665207833c8c89b2c3 SHA1 d0bc064274381334a0de152c9eecadcc8d1d1709 SHA256 ddc2b7d8b9822afcdc167964f13952dda1cd25bc365e512c605b1f691cb1eb0b
+MISC ChangeLog 1164 RMD160 da6e7e50ba468e423ee91e17fc2c51a012d2c8c2 SHA1 1e1deb026276ac47d154d709da70bd81455afca3 SHA256 cd329da04ab33cadb50c5beeec835977fc54a7c422fdea2f301feaafd1afff44
 MISC metadata.xml 220 RMD160 ba793b36fde5acec86d8150ceddf4f3cfb5c2ae9 SHA1 6eb5af4c500c3736062744a87af40484a47e6951 SHA256 9375701257b18e240ba4baf120f7ee473798d867728c9c3fdc50b3b305df7ded
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