X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=2a4fc15634c92ca52c8a49fec4f6fdec57b0e108;hb=95efb9b2fbd478ed0f9ec8d2c28b9508c9006fa9;hp=ffc779b8dd106427c84ed58a991760e9e2240f0c;hpb=a0cae2108cbe9d88defce97fec799d1f592b2cc7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index ffc779b8d..2a4fc1563 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 (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
+			}
+		}
+	}
 }