[pkg-bacula-commits] [bacula] 01/01: fix bacula-director init script to use the basename of $DAEMON, revert changes to bacula-(fd|sd) init scripts

[Carsten Leonhardt]

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

leo pushed a commit to branch jessie-backports
in repository bacula.

commit b2285c59c04b843af9f387e26999b0dd9df147a8
Author: Carsten Leonhardt <leo at debian.org>
Date:   Wed Aug 3 12:39:27 2016 +0200

    fix bacula-director init script to use the basename of $DAEMON,
    revert changes to bacula-(fd|sd) init scripts
---
 debian/bacula-director-common.bacula-director.init | 2 +-
 debian/bacula-fd.init                              | 2 +-
 debian/bacula-sd.init                              | 2 +-
 debian/changelog                                   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index a61d81d..8557074 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -76,7 +76,7 @@ do_start()
 do_stop()
 {
 	start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-		--retry TERM/30/KILL/5 --name $DAEMON
+		--retry TERM/30/KILL/5 --name `basename $DAEMON`
 }
 
 
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 063a2a6..8d1afa0 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -64,7 +64,7 @@ do_start()
 do_stop()
 {
         start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-        --retry TERM/30/KILL/5 --name $DAEMON
+        --retry TERM/30/KILL/5 --exec $DAEMON -- -c $CONFIG $ARGS
 }
 
 case "$1" in
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index 9c4c6a0..5477ff5 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -62,7 +62,7 @@ do_start()
 do_stop()
 {
         start-stop-daemon --oknodo --stop --quiet --pidfile $PIDFILE \
-        --retry TERM/$STOPTIMEOUT/KILL/5 --name $DAEMON
+        --retry TERM/$STOPTIMEOUT/KILL/5 --exec $DAEMON -- -c $CONFIG $ARGS
 }
 
 case "$1" in
diff --git a/debian/changelog b/debian/changelog
index f646e10..cd75376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 bacula (7.4.3+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
-  * Fix init scripts to make extra sure the daemons are restarted on
-    upgrades
+  * Fix bacula-director init script to make sure the daemon is restarted
+    on upgrades
 
- --
+ -- Carsten Leonhardt <leo at debian.org>  Wed, 03 Aug 2016 12:25:50 +0200
 
 bacula (7.4.3+dfsg-1) unstable; urgency=medium
 

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