X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=2a4fc15634c92ca52c8a49fec4f6fdec57b0e108;hb=551a64580fde72a40d00e7b039aa20cecd03a1f2;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..2a4fc1563 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 (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'],
+			}
 
-		package { 'acpi-support-base':
-			ensure => installed
+			package { 'acpi-support-base':
+				ensure => installed
+			}
 		}
 	}
 }