lintian.d.o: Remove redundant + incorrect IfModule mod_userdir

[mirror/dsa-puppet.git] / modules / acpi / manifests / init.pp

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