Module: check_mk
Branch: master
Commit: 2a6f9fe70b834aebc4abed179efd22ef5e1b78a2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a6f9fe70b834a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jan 12 11:45:46 2012 +0100
HP-UX Agent: fix mrpe
---
ChangeLog | 1 +
agents/check_mk_agent.hpux | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f27558c..32b1e53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@
This can be turned off with if_inventory_pad_portnumbers = False.
* Linux agent: wrap freeipmi with lock in order to avoid cache corruption
* New check: megaraid_bbu - check existance & status of LSI MegaRaid BBU module
+ * HP-UX Agent: fix mrpe (remove echo -e and test -e, thanks to Philipp Lemke)
Multisite:
* Improve transaction handling and reload detection: user can have
diff --git a/agents/check_mk_agent.hpux b/agents/check_mk_agent.hpux
index 07b3e31..b9cd120 100755
--- a/agents/check_mk_agent.hpux
+++ b/agents/check_mk_agent.hpux
@@ -128,7 +128,7 @@ fi
# MK's Remote Plugin Executor
-if [ -e "$MK_CONFDIR/mrpe.cfg" ]
+if [ -f "$MK_CONFDIR/mrpe.cfg" ]
then
echo '<<<mrpe>>>'
grep -Ev '^[[:space:]]*($|#)' "$MK_CONFDIR/mrpe.cfg" | \
@@ -136,7 +136,7 @@ then
do
PLUGIN=${cmdline%% *}
OUTPUT=$(eval "$cmdline")
- echo -n "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1
+ echo "(${PLUGIN##*/}) $descr $? $OUTPUT" | tr \\n \\1
echo
done
fi