Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

[mirror/dsa-puppet.git] / modules / linux / manifests / init.pp

diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
index 78ab1da..fc24886 100644 (file)
--- a/modules/linux/manifests/init.pp
+++ b/modules/linux/manifests/init.pp
@@ -1,6 +1,14 @@
 class linux {
        include ferm
-       include ferm::per-host
+       include ferm::per_host
        include entropykey
-       include rng-tools
+       include rng_tools
+       if $::hostname in [fasolo, klecker] {
+               $blacklist_acpi_power_meter = true
+       }
+       if $blacklist_acpi_power_meter {
+               file { '/etc/modprobe.d/hwmon.conf':
+                       content => "blacklist acpi_power_meter"
+               }
+       }
 }