collectd.init.d: Start the daemon using start-stop-daemon's --oknodo option.

This makes sure that the init script exits successfully if the daemon is
already running as requested by section 9.3.2 of the Debian Policy 3.8.1.

diff --git a/debian/changelog b/debian/changelog
index 3eb7b49c6aaad44c10e335d30c663a581e46cae8..488918d08987ed14078a9b8fd215b3a5835010f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,8 +46,12 @@ collectd (4.6.1-1) unstable; urgency=low
   * debian/collectd.overrides:
     - Override "spelling-error-in-description" for the apache plugin name -
       all plugins are spelled lowercase.
+  * debian/collectd.init.d:
+    - Start the daemon using start-stop-daemon's --oknodo option to exit
+      successfully if the daemon is already running as requested by section
+      9.3.2 of the Debian Policy 3.8.1.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 15 Mar 2009 21:12:01 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 15 Mar 2009 21:24:21 +0100
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/collectd.init.d b/debian/collectd.init.d
index 911f64884f3c55c2573a8f3de18c7617178def8f..3368bf9cba72b466f1e08bfe3b1aebe2bbfabac0 100755 (executable)
--- a/debian/collectd.init.d
+++ b/debian/collectd.init.d
@@ -78,10 +78,10 @@ d_start() {
        check_config
 
        if test "$USE_COLLECTDMON" == 1; then
-               start-stop-daemon --start --quiet --pidfile "$_PIDFILE" \
+               start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
                        --exec $COLLECTDMON_DAEMON -- -P "$_PIDFILE" -- -C "$CONFIGFILE"
        else
-               start-stop-daemon --start --quiet --pidfile "$_PIDFILE" \
+               start-stop-daemon --start --quiet --oknodo --pidfile "$_PIDFILE" \
                        --exec $DAEMON -- -C "$CONFIGFILE" -P "$_PIDFILE"
        fi
 }