From 4913278dcca48d40955f8b43e5a6b2b8045b4130 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 7 Aug 2012 10:37:14 +0000
Subject: (install_acpi_pkgs) install acpi & acpid at once, in only one
transaction
---
perl-install/NEWS | 2 ++
perl-install/any.pm | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c7fed68ea..a61044a56 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,8 @@
- autologin:
o support lxdm & slim too (#3715, Derek Jennings)
o install autologin for lxdm & slim too
+- drakboot:
+ o install acpi & acpid at once
- drakxservices:
o when listing services ensure disabled services that can be enabled are
shown (mga#6843)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index c2f7872dc..6291e2d8b 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -116,8 +116,7 @@ sub install_acpi_pkgs {
my $acpi = bootloader::get_append_with_key($b, 'acpi');
my $use_acpi = !member($acpi, 'off', 'ht');
if ($use_acpi) {
- $do_pkgs->ensure_is_installed('acpi', '/usr/bin/acpi', $::isInstall);
- $do_pkgs->ensure_is_installed('acpid', '/usr/sbin/acpid', $::isInstall);
+ $do_pkgs->ensure_files_are_installed([ [ 'acpi', '/usr/bin/acpi' ], [ 'acpid', '/usr/sbin/acpid' ] ], $::isInstall);
}
require services;
services::set_status($_, $use_acpi, $::isInstall) foreach qw(acpi acpid);
--
cgit v1.2.1