diff options
| author | Micah Anderson <micah@riseup.net> | 2012-06-27 23:57:05 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2012-06-27 23:57:05 -0400 |
| commit | 276ed43bac3c6a38f77bd71c5f47be0f8d179d22 (patch) | |
| tree | 20cfae642e1733f382b942392a4fd0f0066695fc | |
| parent | d20265e48c06316d9b8120aed913796231a4ad7d (diff) | |
| parent | e02f8638bcdf08d59b1a13b8a5be5efe1f344f27 (diff) | |
| download | puppet-virtual-276ed43bac3c6a38f77bd71c5f47be0f8d179d22.tar.gz puppet-virtual-276ed43bac3c6a38f77bd71c5f47be0f8d179d22.tar.bz2 | |
Merge branch 'master' of labs.riseup.net:module_virtual
| -rwxr-xr-x | files/munin/vserver_cpu_ | 3 | ||||
| -rw-r--r-- | files/munin/vserver_loadavg | 3 | ||||
| -rwxr-xr-x | files/munin/vserver_resources | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/files/munin/vserver_cpu_ b/files/munin/vserver_cpu_ index 981f262..8ce3a95 100755 --- a/files/munin/vserver_cpu_ +++ b/files/munin/vserver_cpu_ @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) 2006-2008 Holger Levsen and Micah Anderson # @@ -63,6 +63,7 @@ VSERVERS="$vservers" +# FIXME: using arrays is a bashism INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo '<none>'`) KCIN="$[ 16#${INFO[2]} ]"; diff --git a/files/munin/vserver_loadavg b/files/munin/vserver_loadavg index 43ce5e1..147eff9 100644 --- a/files/munin/vserver_loadavg +++ b/files/munin/vserver_loadavg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) 2007 Andrei Morgan # Copyright (C) 2008 Micah Anderson @@ -56,6 +56,7 @@ fi # if vservers are specified, use them; the default is to use all. VSERVERS="$vservers" +# FIXME: using arrays is a bashism INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo '<none>'`) KCIN="$[ 16#${INFO[2]} ]"; diff --git a/files/munin/vserver_resources b/files/munin/vserver_resources index 495614f..05dfecb 100755 --- a/files/munin/vserver_resources +++ b/files/munin/vserver_resources @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (C) 2006-2008 Holger Levsen and Micah Anderson # @@ -127,6 +127,7 @@ VSERVERS="$vservers" LIMITS="$limits" RESOURCE="$resource" +# FIXME: using arrays is a bashism INFO=(`sed 's/.*:\t//' /proc/virtual/info 2>/dev/null || echo '<none>'`) KCIN="$[ 16#${INFO[2]} ]"; |