[gentoo-commits] gentoo-x86 commit in net-im/bitlbee/files: bitlbee.initd-r1 bitlbee.confd-r1

2014-10-09 Thread Alex Alexander (wired) 
wired   14/10/09 09:51:50

  Modified: bitlbee.initd-r1
  Added:bitlbee.confd-r1
  Log:
  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)

Revision  ChangesPath
1.2  net-im/bitlbee/files/bitlbee.initd-r1

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1?rev=1.2view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1?rev=1.2content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1?r1=1.1r2=1.2

Index: bitlbee.initd-r1
===
RCS file: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bitlbee.initd-r17 Oct 2014 07:09:23 -   1.1
+++ bitlbee.initd-r19 Oct 2014 09:51:50 -   1.2
@@ -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 @@
 
 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 $?
 }
 



1.1  net-im/bitlbee/files/bitlbee.confd-r1

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.confd-r1?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.confd-r1?rev=1.1content-type=text/plain

Index: bitlbee.confd-r1
===
# 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

[gentoo-commits] gentoo-x86 commit in net-im/bitlbee/files: bitlbee.initd-r1

2014-10-07 Thread Alex Alexander (wired) 
wired   14/10/07 07:09:23

  Added:bitlbee.initd-r1
  Log:
  init script: stop and restart properly, bug #418461
  
  (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with 
key EB9B4AFA)

Revision  ChangesPath
1.1  net-im/bitlbee/files/bitlbee.initd-r1

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1?rev=1.1view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/bitlbee/files/bitlbee.initd-r1?rev=1.1content-type=text/plain

Index: bitlbee.initd-r1
===
#!/sbin/runscript
# 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 $

DAEMON=/usr/sbin/bitlbee

depend() {
need logger net
}

start () {
ebegin Starting bitlbee
start-stop-daemon --start --quiet \
-u bitlbee:bitlbee  --exec ${DAEMON} -- ${BITLBEE_OPTS}
eend $?
}

stop() {
ebegin Stopping bitlbee
start-stop-daemon --stop --quiet -u bitlbee:bitlbee
eend $?
}