diff options
author | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-04-17 16:36:37 -0400 |
commit | 8f7c0071eb82591477876eeb3f309067853a3261 (patch) | |
tree | b095f01b960b7ba3699da2dfa4d84cd5bb8a6361 /files/plugins/xen | |
parent | ea31faee76141646c173d88bd5bec5aa4a773c1c (diff) | |
parent | a5ce0a9317fc5dd5228cff4c5b6d36366c17b6d5 (diff) |
Merge branch 'master' into leap
Conflicts:
README
manifests/host/cgi.pp
Diffstat (limited to 'files/plugins/xen')
-rwxr-xr-x | files/plugins/xen | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/plugins/xen b/files/plugins/xen index a9f1a1e..378e040 100755 --- a/files/plugins/xen +++ b/files/plugins/xen @@ -20,7 +20,7 @@ fi # we cache xm list for 5 min for perfomance reasons ((find /var/lib/munin/plugin-state/xm_list.state -mmin -5 2>&1 | grep -qE '^\/var\/lib\/munin\/plugin-state\/xm_list\.state$') && \ [ `cat /var/lib/munin/plugin-state/xm_list.state | wc -l` -gt 1 ]) || \ - /usr/sbin/xm list | grep -v "^Name .* Console$" > /var/lib/munin/plugin-state/xm_list.state + /usr/sbin/xm list | grep -v "^Name .* ID" > /var/lib/munin/plugin-state/xm_list.state if [ "$1" = "config" ]; then |