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

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index f2c621b32..a3902ef40 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,26 +1,24 @@
 class acpi {
-	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		if ($::lsbmajdistrelease >= '8') {
-			package { 'acpid':
-				ensure => purged
-			}
+	if (versioncmp($::lsbmajdistrelease, '8') >= 0) {
+		package { 'acpid':
+			ensure => purged
+		}
 
-			package { 'acpi-support-base':
-				ensure => purged
-			}
-		} elsif ($::kvmdomain) {
-			package { 'acpid':
-				ensure => installed
-			}
+		package { 'acpi-support-base':
+			ensure => purged
+		}
+	} elsif ($::kvmdomain) {
+		package { 'acpid':
+			ensure => installed
+		}
 
-			service { 'acpid':
-				ensure  => running,
-				require => Package['acpid'],
-			}
+		service { 'acpid':
+			ensure  => running,
+			require => Package['acpid'],
+		}
 
-			package { 'acpi-support-base':
-				ensure => installed
-			}
+		package { 'acpi-support-base':
+			ensure => installed
 		}
 	}
 }