Module: check_mk
Branch: master
Commit: bc25ccb41e8e906f200925ceb65c05c3a7930e99
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc25ccb41e8e90…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Dec 2 16:32:18 2013 +0100
FIX mk-job is now also usable on CentOS 5+
The mk-job script failed with an error on CentOS 5+ systems,
because the /usr/bin/time command does not support the "--quiet"
option. This option seems to be useless when writing to a file,
therefor we removed this option now.
---
.werks/297 | 11 +++++++++++
ChangeLog | 1 +
agents/mk-job | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/297 b/.werks/297
new file mode 100644
index 0000000..5e67b30
--- /dev/null
+++ b/.werks/297
@@ -0,0 +1,11 @@
+Title: mk-job is now also usable on CentOS 5+
+Level: 1
+Component: checks
+Version: 1.2.3i7
+Date: 1385998226
+Class: fix
+
+The mk-job script failed with an error on CentOS 5+ systems,
+because the /usr/bin/time command does not support the "--quiet"
+option. This option seems to be useless when writing to a file,
+therefor we removed this option now.
diff --git a/ChangeLog b/ChangeLog
index 1e84fab..55d4232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
* 0290 FIX: winperf_processor mem.win: Handling no/empty agent responses correctly
now...
* 0293 FIX: esx_vsphere_counters_ramdisk_sizes: Handles ram disk
"ibmscratch" by default now
* 0012 FIX: Solaris Agent: fixed broken fileinfo section...
+ * 0297 FIX: mk-job is now also usable on CentOS 5+...
Multisite:
* 0001 New filters for selecting several host/service-groups at once...
diff --git a/agents/mk-job b/agents/mk-job
index 22c1914..e1df542 100755
--- a/agents/mk-job
+++ b/agents/mk-job
@@ -54,7 +54,7 @@ if ! type $1 >/dev/null 2>&1; then
fi
date +"start_time %s" > "$OUTPUT_PATH/.$IDENT.running"
-/usr/bin/time -o "$OUTPUT_PATH/.$IDENT.running" --quiet --append \
+/usr/bin/time -o "$OUTPUT_PATH/.$IDENT.running" --append \
-f "exit_code %x\nreal_time %E\nuser_time %U\nsystem_time %S\nreads
%I\nwrites %O\nmax_res_kbytes %M\navg_mem_kbytes %K\ninvol_context_switches
%c\nvol_context_switches %w" $@
RC=$?
mv "$OUTPUT_PATH/.$IDENT.running" "$OUTPUT_PATH/$IDENT"