[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-3-3-g037b600

[Alexander Golovko]

The following commit has been merged in the master branch:
commit ef0c7b8b1ee7060decff3b4757bfb512c11bb98a
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Fri Aug 17 11:51:16 2012 +0400

    Fix waiting for stop in bacula-[fs]d init scripts.
    
    Bacula storage and file daemons init script didn't wait for real daemon
    stopping in stop action (#684744).

diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index da31862..fc52573 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -60,7 +60,7 @@ do_start()
 do_stop()
 {
         start-stop-daemon -c "$DAEMONUSER" --stop --quiet --pidfile $PIDFILE \
-        --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
+        --oknodo --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 6e8102b..2e0ecb5 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -57,7 +57,7 @@ do_start()
 do_stop()
 {
         start-stop-daemon -c "$DAEMONUSER" --stop --quiet --pidfile $PIDFILE \
-        --oknodo --exec $DAEMON -- -c $CONFIG $ARGS
+        --oknodo --retry TERM/30/KILL/5 --exec $DAEMON -- -c $CONFIG $ARGS
 }
 
 case "$1" in

-- 
Bacula, a network backup, recovery and verification program