X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=a3902ef4023d2bf6d4df33158fc3af3b2719f07f;hb=f4a8a766c3bd060ea9b2c8c8c75ae052b89df4b9;hp=c427cb99bf7d40492b5cbab3595ecfed0d255885;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index c427cb99b..a3902ef40 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,13 +1,24 @@
 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
 		}
 
-		if $::lsbdistcodename != 'lenny' {
-			package { 'acpi-support-base':
-				ensure => installed
-			}
+		service { 'acpid':
+			ensure  => running,
+			require => Package['acpid'],
+		}
+
+		package { 'acpi-support-base':
+			ensure => installed
 		}
 	}
 }