collectd.init.d: Do not suppress output when checking the configuration.

This will also show errors that don't cause collectd to abort, e.g. failure to
load plugins.

Closes: #499232

diff --git a/debian/changelog b/debian/changelog
index a4aecb26a0bcfd16ef10715ecc0d4eb4fb7c8936..a6b23125e5d18d565fe69663a250ab7225aff28b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ collectd (4.4.2-2) unstable; urgency=low
     in 4.4.1-1 and instead build depend on libopenipmi-dev (>= 2.0.14-1~)
     which includes fixed .pc files. This fixes an undefined symbol error when
     loading the ipmi plugin caused by that work around (Closes: #494665).
+  * debian/collectd.init.d:
+    - The "status" command now exits with 1 if collectd is not running.
+    - Do not suppress output when checking the configuration with the -t
+      command line option. This will also show errors that don't cause
+      collectd to abort, e.g. failure to load plugins (Closes: #499232).
   * Added debian/patches/perl_deadlock.dpatch - upstream patch to fix a
     possible deadlock in the perl plugin (Closes: #499179).
   * Added debian/patches/memory_libstatgrab.dpatch - trivial upstream patch to
@@ -17,7 +22,7 @@ collectd (4.4.2-2) unstable; urgency=low
   * Added debian/patches/memcached_timeout.dpatch - trivial upstream patch to
     fix the timeout passed to poll(2).
 
- -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Sep 2008 11:03:50 +0200
+ -- Sebastian Harl <sh@tokkee.org>  Thu, 18 Sep 2008 18:49:22 +0200
 
 collectd (4.4.2-1) unstable; urgency=low
 

diff --git a/debian/collectd.init.d b/debian/collectd.init.d
index 47b95aba8995d40f0499db22ff199cd32bd6659d..e61bbe7504d3e6ad452e857d8afadb788f18dec4 100755 (executable)
--- a/debian/collectd.init.d
+++ b/debian/collectd.init.d
@@ -66,8 +66,7 @@ d_start() {
                return 0
        fi
 
-       if ! $DAEMON -t -C "$CONFIGFILE" > /dev/null 2>&1; then
-               $DAEMON -t -C "$CONFIGFILE"
+       if ! $DAEMON -t -C "$CONFIGFILE"; then
                exit 1
        fi