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

[Luca Capello]

The following commit has been merged in the master branch:
commit dd038eca9e8ff7d0230da1bcd2fd4b1ebffd8434
Author: Luca Capello <luca at pca.it>
Date:   Sun Jun 24 14:02:39 2012 +0200

    debian/bacula-*.init: add $NAME to log_daemon_msg calls

diff --git a/debian/bacula-director-common.bacula-director.init b/debian/bacula-director-common.bacula-director.init
index a1ea6a9..439b81a 100644
--- a/debian/bacula-director-common.bacula-director.init
+++ b/debian/bacula-director-common.bacula-director.init
@@ -107,7 +107,7 @@ case "$1" in
 	fi
 
 	create_var_run_dir
-	log_daemon_msg "Starting $DESC..."
+	log_daemon_msg "Starting $DESC..." "$NAME"
         if do_start ; then
                 log_end_msg 0
         else
@@ -116,7 +116,7 @@ case "$1" in
   ;;
 
   stop)
-        log_daemon_msg "Stopping $DESC..."
+        log_daemon_msg "Stopping $DESC..." "$NAME"
         if do_stop ; then
                 log_end_msg 0
         else
@@ -125,7 +125,7 @@ case "$1" in
   ;;
 
   reload)
-        log_daemon_msg "Reloading $DESC..."
+        log_daemon_msg "Reloading $DESC..." "$NAME"
         get_pid $PIDFILE
         if [ -n "$pid" ]; then kill_pid HUP $pid ;
         else do_start ;
diff --git a/debian/bacula-fd.init b/debian/bacula-fd.init
index 731eac0..2a213c4 100644
--- a/debian/bacula-fd.init
+++ b/debian/bacula-fd.init
@@ -68,7 +68,7 @@ case "$1" in
                 exit 0
         fi
 
-        log_daemon_msg "Starting $DESC..."
+        log_daemon_msg "Starting $DESC..." "$NAME"
         if do_start ; then
                 log_end_msg 0
         else
@@ -76,7 +76,7 @@ case "$1" in
         fi
         ;;
   stop)
-        log_daemon_msg "Stopping $DESC..."
+        log_daemon_msg "Stopping $DESC..." "$NAME"
         if do_stop ; then
                 log_end_msg 0
         else
diff --git a/debian/bacula-sd.init b/debian/bacula-sd.init
index f08d037..4813c67 100644
--- a/debian/bacula-sd.init
+++ b/debian/bacula-sd.init
@@ -65,7 +65,7 @@ case "$1" in
 		exit 0
 	fi
 
-	log_daemon_msg "Starting $DESC..."
+	log_daemon_msg "Starting $DESC..." "$NAME"
 	if do_start ; then
                 log_end_msg 0
         else
@@ -73,7 +73,7 @@ case "$1" in
         fi
 	;;
   stop)
-	log_daemon_msg "Stopping $DESC... "
+	log_daemon_msg "Stopping $DESC... " "$NAME"
         if do_stop ; then
                 log_end_msg 0
         else
diff --git a/debian/changelog b/debian/changelog
index 5cd1949..a40649b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ bacula (5.2.6+dfsg-2) UNRELEASED; urgency=low
 
   * debian/bacula-*.init:
     + check if the daemon is executable.
+    + add $NAME to log_daemon_msg calls.
   * debian/bacula-director-*.postinst,
     debian/bacula-fd.postinst, debian/bacula-sd.postinst:
     + move set call at the top.

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