X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=a3902ef4023d2bf6d4df33158fc3af3b2719f07f;hb=0808e7cdefd89761bee793e373d391ea076ff3de;hp=ef4dcdedc7dcdc623fbb7d9eb5e618b414894ce9;hpb=96d02de0e841b2a067dba244d62562cd46d4035b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index ef4dcdedc..a3902ef40 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,5 +1,13 @@
 class acpi {
-	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		package { 'acpid':
+			ensure => purged
+		}
+
+		package { 'acpi-support-base':
+			ensure => purged
+		}
+	} elsif ($::kvmdomain) {
 		package { 'acpid':
 			ensure => installed
 		}
@@ -9,10 +17,8 @@ class acpi {
 			require => Package['acpid'],
 		}
 
-		if $::lsbdistcodename != 'lenny' {
-			package { 'acpi-support-base':
-				ensure => installed
-			}
+		package { 'acpi-support-base':
+			ensure => installed
 		}
 	}
 }