From: Stephen Shkardoon <ss23@ss23.geek.nz>
Date: Sat, 20 Jan 2018 19:46:41 +0000 (+1300)
Subject: net-p2p/rtorrent: Fix init script to ensure PID file is created
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=427400b35fe4f1d1cafbad62458e2f5faae8b7e0;p=gentoo.git

net-p2p/rtorrent: Fix init script to ensure PID file is created

By only replacing the PID in the stop action, we can ensure
start-stop-daemon had time to create the PID file.

Closes: https://bugs.gentoo.org/634852

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---

diff --git a/net-p2p/rtorrent/files/rtorrentd.init b/net-p2p/rtorrent/files/rtorrentd.init
index 06fab7d20846..83943cd56611 100644
--- a/net-p2p/rtorrent/files/rtorrentd.init
+++ b/net-p2p/rtorrent/files/rtorrentd.init
@@ -21,13 +21,14 @@ start() {
 			--env HOME="${PWHOME:-/home/$USER}" \
 			--name rtorrent \
 			--exec /usr/bin/screen -- -D -m -S rtorrentd /usr/bin/rtorrent
-	# Because we've daemonized with screen, we need to replace the PID file with the real PID of rtorrent
-	pgrep -P $(cat /var/run/rtorrentd.pid) > /var/run/rtorrentd.pid
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping rtorrent"
+	# Because we've daemonized with screen, we need to replace the PID file with the real PID of rtorrent
+	pgrep -P $(cat /var/run/rtorrentd.pid) > /var/run/rtorrentd.pid
+
 	start-stop-daemon --stop --signal 15 \
 			--pidfile /var/run/rtorrentd.pid
 	eend $?