summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavid <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>2007-08-08 07:13:06 +0000
committerdavid <david@f03ff2f1-f02d-0410-970d-b9634babeaa1>2007-08-08 07:13:06 +0000
commit12566b8a142d2712a8059c02abf2b89cc59ff5e0 (patch)
treea75bbf162f8218384031053d41290a277f17e067
parent3e187eafe5e0e905b55517e9f2b0e696aa2a8c6c (diff)
fix acpi_available return values and usage
git-svn-id: http://club.black.co.at:82/svn/manifests/trunk@183 f03ff2f1-f02d-0410-970d-b9634babeaa1
-rw-r--r--files/facter/acpi_available.rb4
-rw-r--r--manifests/plugin.pp6
2 files changed, 4 insertions, 6 deletions
diff --git a/files/facter/acpi_available.rb b/files/facter/acpi_available.rb
index 45e5288..216f608 100644
--- a/files/facter/acpi_available.rb
+++ b/files/facter/acpi_available.rb
@@ -2,9 +2,9 @@
Facter.add("acpi_available") do
setcode do
if `acpi -t -B -A 2>/dev/null`.match(/\d/).nil?
- "false"
+ "absent"
else
- "true"
+ "present"
end
end
end
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index e875ddb..fb2f882 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -112,10 +112,8 @@ class munin::plugins::linux inherits munin::plugins::base {
vmstat
]:
ensure => present;
- }
-
- if $acpi_available {
- plugin { acpi: }
+ acpi:
+ ensure => $acpi_available;
}
include munin::plugins::interfaces