aboutsummaryrefslogtreecommitdiffstats
path: root/debian/bitlbee.init
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-03-20 18:03:18 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2010-03-20 18:03:18 +0000
commit81ee561d520e38535fb6947ac0e3fba808e6de4b (patch)
tree122a46d40947e854fa643938c89ae7a6889eb52a /debian/bitlbee.init
parent33304688895db5751f9ef087ff92b0a9dc284627 (diff)
parent0baed0da940c0d82280a5674d7fa8ad06d449384 (diff)
Merging head. Most changes are not so relevant because they're to IM
modules.
Diffstat (limited to 'debian/bitlbee.init')
-rwxr-xr-xdebian/bitlbee.init10
1 files changed, 1 insertions, 9 deletions
diff --git a/debian/bitlbee.init b/debian/bitlbee.init
index 1ab1bc43..4c224ffc 100755
--- a/debian/bitlbee.init
+++ b/debian/bitlbee.init
@@ -40,15 +40,7 @@ d_start() {
touch /var/run/bitlbee.pid
chown bitlbee: /var/run/bitlbee.pid
- # Clean up after the bug between 1.2-5 and 1.2.1-2 where BitlBee ran
- # as root. (#494656 and #495877) Fixing this in the postinst script
- # is not enough since the user will restart his BitlBee after up-
- # grading the package, and the BitlBee running as root will then
- # save its settings, re-setting ownership of the file to root.
- # TODO: Remove this after a few revisions.
- find /var/lib/bitlbee -uid 0 -name '*.xml' -exec chown bitlbee: {} \;
-
- start-stop-daemon --start --quiet \
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- -p $BITLBEE_PORT -P $PIDFILE $BITLBEE_OPTS
}