[pkg-bacula-commits] [bacula] 01/02: Fix init scripts to make sure the daemons can be stopped before upgrades or when /etc/defaults/bacula-* were edited (enhanced merge from branch 'jessie-backports')

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 68136d89ece63539c6d1b3b40f238122eebf7121
Merge: 40fbe4e b2285c5
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Aug 3 19:51:45 2016 +0200

    Fix init scripts to make sure the daemons can be stopped before
    upgrades or when /etc/defaults/bacula-* were edited
    (enhanced merge from branch 'jessie-backports')

 debian/bacula-director-common.bacula-director.init | 2 +-
 debian/bacula-fd.init                              | 2 +-
 debian/bacula-sd.init                              | 2 +-
 debian/changelog                                   | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --cc debian/bacula-fd.init
index 8d1afa0,8d1afa0..d758a13
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@@ -64,7 -64,7 +64,7 @@@ do_start(
  do_stop()
  {
          start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
--        --retry TERM/30/KILL/5 --exec $DAEMON -- -c $CONFIG $ARGS
++        --retry TERM/30/KILL/5 --name `basename $DAEMON`
  }
  
  case "$1" in
diff --cc debian/bacula-sd.init
index 5477ff5,5477ff5..41afb83
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@@ -62,7 -62,7 +62,7 @@@ do_start(
  do_stop()
  {
          start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
--        --retry TERM/$STOPTIMEOUT/KILL/5 --exec $DAEMON -- -c $CONFIG $ARGS
++        --retry TERM/$STOPTIMEOUT/KILL/5 --name `basename $DAEMON`
  }
  
  case "$1" in
diff --cc debian/changelog
index d16fdec,cd75376..8cd5480
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,11 +1,10 @@@
 -bacula (7.4.3+dfsg-1~bpo8+1) jessie-backports; urgency=medium
++bacula (7.4.3+dfsg-1+sid1) unstable; urgency=medium
+ 
 -  * Rebuild for jessie-backports.
 -  * Fix bacula-director init script to make sure the daemon is restarted
 -    on upgrades
++  * Fix init scripts to make sure the daemons can be stopped before
++    upgrades or when /etc/defaults/bacula-* were edited
+ 
 - -- Carsten Leonhardt <leo at debian.org>  Wed, 03 Aug 2016 12:25:50 +0200
++ --
+ 
  bacula (7.4.3+dfsg-1) unstable; urgency=medium
  
    * New upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git