diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-17 21:54:43 -0200 |
| commit | e87974d37018b7ab8cf422a0797644c20e84e0c6 (patch) | |
| tree | f356efc902b44e9d39efe06f8c7284b4fbb729a3 /files/munin/vserver_resources | |
| parent | f9096cf9a0115d47755c1eb5421efe1885b4f8fc (diff) | |
| parent | 711a471ae8c77f0fce3f05dd57ebd308d0144f57 (diff) | |
| download | puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.gz puppet-virtual-e87974d37018b7ab8cf422a0797644c20e84e0c6.tar.bz2 | |
Merge branch 'master' of git://labs.riseup.net/module_virtual
Conflicts:
manifests/vserver.pp
Diffstat (limited to 'files/munin/vserver_resources')
| -rwxr-xr-x | files/munin/vserver_resources | 3 |
1 files changed, 2 insertions, 1 deletions
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]} ]"; |