X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=2a4fc15634c92ca52c8a49fec4f6fdec57b0e108;hb=61e41608b123700be4cca1cde42c4e38d7fb0078;hp=ef4dcdedc7dcdc623fbb7d9eb5e618b414894ce9;hpb=96d02de0e841b2a067dba244d62562cd46d4035b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index ef4dcdedc..2a4fc1563 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,15 +1,23 @@
 class acpi {
 	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		package { 'acpid':
-			ensure => installed
-		}
+		if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+			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'],
+			}
 
-		if $::lsbdistcodename != 'lenny' {
 			package { 'acpi-support-base':
 				ensure => installed
 			}