X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=f2c621b321934a5e2b48e157db6c9906940003ac;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=e6cce8de99c15e4dbf268d4ccd9650e9cd08cb8f;hpb=103e56b48752f77fd66edd1824d82946570ca033;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index e6cce8de9..f2c621b32 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,16 +1,26 @@
 class acpi {
 	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		package { 'acpid':
-			ensure => installed
-		}
+		if ($::lsbmajdistrelease >= '8') {
+			package { 'acpid':
+				ensure => purged
+			}
 
-		service { 'acpid':
-			ensure  => running,
-			require => Package['acpid'],
-		}
+			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
+			package { 'acpi-support-base':
+				ensure => installed
+			}
 		}
 	}
 }