[checkmk-commits] Check_MK Git: check_mk: #1258 FIX fileinfo solaris: Fixed configuration crash

Module: check_mk Branch: master Commit: 077d69a05370f46ee49145bc812bd12f2e27dfba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077d69a05370f4… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Jun 11 09:14:31 2015 +0200 #1258 FIX fileinfo solaris: Fixed configuration crash The fix is located in the agent. --- .werks/1258 | 11 +++++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1258 b/.werks/1258 new file mode 100644 index 0000000..146f3fa --- /dev/null +++ b/.werks/1258 @@ -0,0 +1,11 @@ +Title: fileinfo solaris: Fixed configuration crash +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1434006788 + +The fix is located in the agent. + diff --git a/ChangeLog b/ChangeLog index 013c790..8aaae1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,7 @@ * 2217 FIX: md: Fix handling of found and expected disks * 2309 FIX: cpu_util checks: removed superfluous space in check output * 1257 FIX: oracle_jobs: Fix: Discovery now supports the old oracle plugin again + * 1258 FIX: fileinfo solaris: Fixed configuration crash... Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index f0f2082..8fecfa8 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -269,7 +269,7 @@ then /usr/bin/perl -e 'print time."\n"' for file in $(cat "$MK_CONFDIR/fileinfo.cfg") do - ls $file 2>/dev/null + ls $file 2>&1>/dev/null if [ $? -eq 0 ]; then ls $file | sort -u | \ /usr/bin/perl -e '