[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-10-g30ef9e9

[Willem van den Akker]

The following commit has been merged in the master branch:
commit 30ef9e9764bbe7595e9c34baf792c00da7e45633
Author: Jan Hauke Rahm <jhr at debian.org>
Date:   Wed Apr 13 11:27:17 2011 +0200

    Fix: init scripts fail if daemon already running
    
    Closes: #608600
    Thanks: Corey Hickey <bugfood-c at fatooh.org>

diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index 7596ba3..021fd87 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -56,7 +56,7 @@ kill_pid()
 do_start()
 {
 	start-stop-daemon --start --quiet --pidfile $PIDFILE \
-	--exec $DAEMON -- $ARGS
+	--oknodo --exec $DAEMON -- $ARGS
 }
 
 # do_stop()
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 2df2245..3f98ca9 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -39,7 +39,7 @@ PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 do_start()
 {
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- $ARGS
+        --oknodo --exec $DAEMON -- $ARGS
 }
 
 do_stop()
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index f902982..f914645 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -37,7 +37,7 @@ PIDFILE=/var/run/bacula/$NAME.$PORT.pid
 do_start()
 {
         start-stop-daemon --start --quiet --pidfile $PIDFILE \
-        --exec $DAEMON -- $ARGS
+        --oknodo --exec $DAEMON -- $ARGS
 }
 
 do_stop()

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