X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Flinux%2Fmanifests%2Finit.pp;h=967b4a79a28d445b29c25f064a07d12f676b2ce4;hb=ed3fa843350ea51e5505c3fae278590a6958e298;hp=78ab1da775f5fda106801dc27cfcf8ed8abfa89f;hpb=71a8d524f79fa0eda9a90b535b5008691daeeb60;p=mirror%2Fdsa-puppet.git

diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
index 78ab1da77..967b4a79a 100644
--- 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, storace, sallinen, csail-node01, csail-node02] {
+		$blacklist_acpi_power_meter = true
+	}
+	if $blacklist_acpi_power_meter {
+		file { '/etc/modprobe.d/hwmon.conf':
+			content => "blacklist acpi_power_meter"
+		}
+	}
 }