X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=8ec3b06131d2d72ad5ec59fad41b18801f0df156;hb=972528da88c48db95741697fc1f862f022c78c16;hp=a3902ef4023d2bf6d4df33158fc3af3b2719f07f;hpb=641b06da386fa4d8f9d992fdcc88470c63bb8835;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index a3902ef40..8ec3b0613 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,24 +1,9 @@
 class acpi {
-	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
-		package { 'acpid':
-			ensure => purged
-		}
-
-		package { 'acpi-support-base':
-			ensure => purged
-		}
-	} elsif ($::kvmdomain) {
-		package { 'acpid':
-			ensure => installed
-		}
-
-		service { 'acpid':
-			ensure  => running,
-			require => Package['acpid'],
-		}
+	package { 'acpid':
+		ensure => purged
+	}
 
-		package { 'acpi-support-base':
-			ensure => installed
-		}
+	package { 'acpi-support-base':
+		ensure => purged
 	}
 }