X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Flinux%2Fmanifests%2Finit.pp;h=97cc6431b4e0ede0a0d618ff6d9f3d085bcdc8f6;hb=02a676416dddafb10f13902b316b6a581c57b1e9;hp=8977b1b92226eb0f91ed8abb028e1e60bca6746a;hpb=6f7cf235a2677fdb7043623f25c8d8edaef7568b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/linux/manifests/init.pp b/modules/linux/manifests/init.pp
index 8977b1b92..97cc6431b 100644
--- a/modules/linux/manifests/init.pp
+++ b/modules/linux/manifests/init.pp
@@ -1,5 +1,14 @@
 class linux {
 	include ferm
-	include ferm::per-host
+	include ferm::per_host
 	include entropykey
+	include rng_tools
+	if $::hostname in [fasolo, klecker, mirror-conova, storace, sallinen] {
+		$blacklist_acpi_power_meter = true
+	}
+	if $blacklist_acpi_power_meter {
+		file { '/etc/modprobe.d/hwmon.conf':
+			content => "blacklist acpi_power_meter"
+		}
+	}
 }