summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-31 09:12:44 +0000
committerThierry Vignaud <thierry.vignaud@gmail.com>2013-12-14 14:00:15 +0100
commit7eea5598d49f490a49ec0e9a3ceb9f6d230faae8 (patch)
tree72e9517cb2fd6a03edb56127af06f38cc99e686d
parentd1f8c88268e13bc4b7ccf8bdb20c2534be648af5 (diff)
downloaddrakx-7eea5598d49f490a49ec0e9a3ceb9f6d230faae8.tar
drakx-7eea5598d49f490a49ec0e9a3ceb9f6d230faae8.tar.gz
drakx-7eea5598d49f490a49ec0e9a3ceb9f6d230faae8.tar.bz2
drakx-7eea5598d49f490a49ec0e9a3ceb9f6d230faae8.tar.xz
drakx-7eea5598d49f490a49ec0e9a3ceb9f6d230faae8.zip
fix displaying need to install acpi* packages when re already installed
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0896d6d7a..9eeb6d77b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
-- ensure files are installed for nfs (mga#10301)
-- remove_unused_packages()
+- drakboot:
+ o fix displaying need to install acpi* packages when they're already installed
+- finish-install:
kbluetooth is replaced by bluedevil, (#10082)
Version 15.54.1 - 13 June 2013
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)