X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Facpi%2Fmanifests%2Finit.pp;h=598cd16324df84f0ee21e6b2f6cd7dc1284d9536;hb=bd9b733800a758981022c6796877d5ee2ec440b9;hp=c12847fc8dc4b0a71ff71de70655772bcaa400f9;hpb=6047b4170980bbcad7f4015c954a9d061b5c4324;p=dsa-puppet.git

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index c12847fc..598cd163 100644
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,13 +1,25 @@
 class acpi {
-    if $debarchitecture not in ['kfreebsd-amd64', kfreebsd-i386'] {
-        package {
-            acpid: ensure => installed
-        }
+	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
+		if ($::lsbmajdistrelease >= 8) {
+			package { 'acpid':
+				ensure => purged
+			}
 
-        if $lsbdistcodename != 'lenny' {
-            package {
-                acpi-support-base: ensure => installed
-            }
-        }
-    }
+			package { 'acpi-support-base':
+				ensure => purged
+			}
+		} else {
+			package { 'acpid':
+				ensure => installed
+			}
+
+			service { 'acpid':
+				ensure  => running,
+				require => Package['acpid'],
+			}
+
+			package { 'acpi-support-base':
+				ensure => installed
+			}
+	}
 }