Merge remote-tracking branch 'origin/master' into staging

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

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index 2a4fc15..8ec3b06 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,26 +1,9 @@
 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
-                       }
-
-                       service { 'acpid':
-                               ensure  => running,
-                               require => Package['acpid'],
-                       }
+       package { 'acpid':
+               ensure => purged
+       }
 
-                       package { 'acpi-support-base':
-                               ensure => installed
-                       }
-               }
+       package { 'acpi-support-base':
+               ensure => purged
        }
 }