X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=feadbe356f85bd8d840dcd34974968facb187a69;hb=2fc76fdf7b368a560901ee3578bd3abf47ab2365;hp=af961ba0308d931a0abd3ca13a7a4aaa14472d04;hpb=a87583c43b4d24720e2c3a756fdbec84e4f4b627;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index af961ba03..feadbe356 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
+			}
+		}
+	}
 }