X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=f2c621b321934a5e2b48e157db6c9906940003ac;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;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..f2c621b32 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,13 +1,26 @@
 class acpi {
-    if ! $debarchitecture in ['kfreebsd-amd64', kfreebsd-i386'] {
-        package {
-            acpid: ensure => installed
-        }
+	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		if ($::lsbmajdistrelease >= '8') {
+			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
+			}
+		}
+	}
 }