Remove acpid and acpi-support base on jessie machines.

ACPI support is handled by systemd-logind in jessie and later:

https://www.debian.org/releases/jessie/amd64/release-notes/ch-information.en.html#idp39488784

Suggested-by: ansgar on #debian-admin

diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp
index e6cce8de99c15e4dbf268d4ccd9650e9cd08cb8f..598cd16324df84f0ee21e6b2f6cd7dc1284d9536 100644 (file)
--- a/modules/acpi/manifests/init.pp
+++ b/modules/acpi/manifests/init.pp
@@ -1,16 +1,25 @@
 class acpi {
        if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
 class acpi {
        if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {

-               package { 'acpid':
-                       ensure => installed
-               }
+               if ($::lsbmajdistrelease >= 8) {
+                       package { 'acpid':
+                               ensure => purged
+                       }

 
 

-               service { 'acpid':
-                       ensure  => running,
-                       require => Package['acpid'],
-               }
+                       package { 'acpi-support-base':
+                               ensure => purged
+                       }
+               } else {
+                       package { 'acpid':
+                               ensure => installed
+                       }

 
 

-               package { 'acpi-support-base':
-                       ensure => installed
-               }
+                       service { 'acpid':
+                               ensure  => running,
+                               require => Package['acpid'],
+                       }
+
+                       package { 'acpi-support-base':
+                               ensure => installed
+                       }

        }
 }
        }
 }