init: let users choose if they want forks stopped

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EB9B4AFA)

2 files changed, 17 insertions, 3 deletions

diff --git a/net-im/bitlbee/files/bitlbee.confd-r1 b/net-im/bitlbee/files/bitlbee.confd-r1
new file mode 100644
index 000000000000..d581222f9fb9
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.confd-r1
@@ -0,0 +1,8 @@
+# Bitlbee options (see /usr/sbin/bitlbee -h)
+BITLBEE_OPTS="-F"
+
+# By default, the bitlbee init script will attempt to stop
+# all bitlbee-owned processes, including per-client forks.
+# Setting this to "no" tells the init script to only
+# stop the main bitlbee process.
+BITLBEE_STOP_ALL="yes"
diff --git a/net-im/bitlbee/files/bitlbee.initd-r1 b/net-im/bitlbee/files/bitlbee.initd-r1
index ab2b7bdb0300..cfd0fe68a3fb 100644
--- a/net-im/bitlbee/files/bitlbee.initd-r1
+++ b/net-im/bitlbee/files/bitlbee.initd-r1
@@ -2,9 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or
 # later
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1,v 1.1 2014/10/07 07:09:23 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1,v 1.2 2014/10/09 09:51:50 wired Exp $
 
 DAEMON=/usr/sbin/bitlbee
+PIDFILE=/var/run/bitlbee/bitlbee.pid
 
 depend() {
 	need logger net
@@ -12,14 +13,19 @@ depend() {
 
 start () {
 	ebegin "Starting bitlbee"
+	checkpath -d -m 0755 -o bitlbee:bitlbee $(dirname ${PIDFILE})
 	start-stop-daemon --start --quiet \
-		-u bitlbee:bitlbee  --exec ${DAEMON} -- ${BITLBEE_OPTS}
+		-u bitlbee:bitlbee --exec ${DAEMON} --pidfile ${PIDFILE} \
+		-- -P ${PIDFILE} ${BITLBEE_OPTS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping bitlbee"
-	start-stop-daemon --stop --quiet -u bitlbee:bitlbee
+	local pidfile=
+	yesno ${BITLBEE_STOP_ALL:-YES} ||
+		pidfile="--pidfile ${PIDFILE}"
+	start-stop-daemon --stop --quiet ${pidfile} -u bitlbee:bitlbee
 	eend $?
 }