summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-31 09:12:44 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-31 09:12:44 +0000
commit53907563b98e08fd4a9520e3463c0992477cd768 (patch)
treecb2cae6d9ee7fcc3514406cff96317fbe181ff1f
parent891ba0678136faa17621d0ec88f8b53049560efa (diff)
fix displaying need to install acpi* packages when re already installed
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index ffcfd42b7..b75a29c87 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot:
+ o fix displaying need to install acpi* packages when they're already installed
- finish-install:
kbluetooth is replaced by bluedevil, (#10082)
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 23c30d1cd..ad6f1c0a3 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -116,7 +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_files_are_installed([ [ qw(acpi /usr/bin/acpi) ], [ qw(acpid /usr/sbin/acpid) ] ], $::isInstall);
+ $do_pkgs->ensure_files_are_installed([ [ qw(acpi acpi) ], [ qw(acpid acpid) ] ], $::isInstall);
}
require services;
services::set_status($_, $use_acpi, $::isInstall) foreach qw(acpi acpid);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index eebad1fa6..b06abfb26 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- bootloader:
+ o fix displaying need to install acpi* packages when they're already installed
+
Version 15.54 - 17 May 2013
- do not enable legacy sysvinit scripts that no longer exist (mga#10084)