From 9a8442eb98d5bb928b2f925e0098bcb08e79981e Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Sat, 4 Mar 2006 18:02:14 +0000
Subject: enable acpi/acpid services when needed, disable them otherwise
 (#21316)

---
 perl-install/any.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index e41b51c13..3057b03e0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -115,9 +115,13 @@ sub install_acpi_pkgs {
     my ($do_pkgs, $b) = @_;
 
     my $acpi = bootloader::get_append_with_key($b, 'acpi');
-    if (!member($acpi, 'off', 'ht')) {
-	$do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid");
+    my $use_acpi = !member($acpi, 'off', 'ht');
+    if ($use_acpi) {
+	$do_pkgs->ensure_is_installed('acpi', '/usr/bin/acpi');
+	$do_pkgs->ensure_is_installed('acpid', '/usr/sbin/acpid');
     }
+    require services;
+    services::set_status($_, $use_acpi, $::isInstall) foreach qw(acpi acpid);
 }
 
 sub setupBootloader {
-- 
cgit v1.2.1