From 9dbe4540d93121e72b56e31e58fe01de1b45fcd0 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 18 Sep 2008 18:54:35 +0200 Subject: [PATCH] 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 --- debian/changelog | 7 ++++++- debian/collectd.init.d | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4aecb2..a6b2312 100644 --- 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 Thu, 18 Sep 2008 11:03:50 +0200 + -- Sebastian Harl 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 47b95ab..e61bbe7 100755 --- 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 -- 2.30.2