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

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index df22d76ba..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'] {
-        package {
-            acpid: ensure => installed
-        }
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		package { 'acpid':
+			ensure => purged
+		}
 
-        if $lsbdistcodename != 'lenny' {
-            package {
-                acpi-support-base: ensure => installed
-            }
-        }
-    }
+		package { 'acpi-support-base':
+			ensure => purged
+		}
+	} elsif ($::kvmdomain) {
+		package { 'acpid':
+			ensure => installed
+		}
+
+		service { 'acpid':
+			ensure  => running,
+			require => Package['acpid'],
+		}
+
+		package { 'acpi-support-base':
+			ensure => installed
+		}
+	}
 }