From bd9b733800a758981022c6796877d5ee2ec440b9 Mon Sep 17 00:00:00 2001 From: Paul Wise Date: Mon, 9 Nov 2015 17:47:57 +0800 Subject: [PATCH] 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 --- modules/acpi/manifests/init.pp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/modules/acpi/manifests/init.pp b/modules/acpi/manifests/init.pp index e6cce8de..598cd163 100644 --- 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']) { - 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 + } } } -- 2.39.2