Fixed up init script for daemon mode (problems when using baselayout-2)

(Portage version: 2.1.9.42/cvs/Linux x86_64)

4 files changed, 18 insertions, 6 deletions

diff --git a/net-p2p/rtorrent/ChangeLog b/net-p2p/rtorrent/ChangeLog
index 8301816196df..18a0d829c8e0 100644
--- a/net-p2p/rtorrent/ChangeLog
+++ b/net-p2p/rtorrent/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/rtorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.160 2011/04/18 20:03:52 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/ChangeLog,v 1.161 2011/05/09 21:34:21 sochotnicky Exp $
+
+*rtorrent-0.8.7-r3 (09 May 2011)
+*rtorrent-0.8.6-r4 (09 May 2011)
+
+  09 May 2011; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+  -rtorrent-0.8.6-r3.ebuild, +rtorrent-0.8.6-r4.ebuild,
+  -rtorrent-0.8.7-r2.ebuild, +rtorrent-0.8.7-r3.ebuild, files/rtorrentd.init:
+  Fixed up init script for daemon mode (problems when using baselayout-2)
 
 *rtorrent-0.8.7-r2 (18 Apr 2011)
 
diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index 9d64a9a81159..e160b99f9c01 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.6 2011/04/11 21:24:18 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/files/rtorrentd.init,v 1.7 2011/05/09 21:34:21 sochotnicky Exp $
 
 depend() {
 	use net ypbind nis
@@ -15,16 +15,20 @@ start() {
 	env TERM="xterm" \
 		start-stop-daemon \
 			--start \
+			--make-pidfile \
+			--pidfile /var/run/rtorrentd.pid \
+			--background \
 			--user $USER \
 			--chuid $USER \
 			--env HOME="${PWHOME:-/home/$USER}" \
 			--name rtorrent \
-			--exec /usr/bin/screen -- -d -m -S rtorrentd /usr/bin/rtorrent
+			--exec /usr/bin/screen -- -D -m -S rtorrentd /usr/bin/rtorrent
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping rtorrent"
-	start-stop-daemon --stop --signal 2 --name rtorrent
+	start-stop-daemon --stop --signal 15 \
+			--pidfile /var/run/rtorrentd.pid
 	eend $?
 }
diff --git a/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild b/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
index 3ac83a9a21ee..84bc602816b7 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r3.ebuild,v 1.1 2011/04/11 21:24:18 sochotnicky Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.6-r4.ebuild,v 1.1 2011/05/09 21:34:21 sochotnicky Exp $
 
 EAPI=2
 
diff --git a/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild b/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild
index 24f84c11088b..4293767f37f3 100644
--- a/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r2.ebuild,v 1.2 2011/04/18 23:54:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/rtorrent/rtorrent-0.8.7-r3.ebuild,v 1.1 2011/05/09 21:34:21 sochotnicky Exp $
 
 EAPI=2