diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:22 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-13 10:35:22 +0000 |
| commit | 6f24da26d79b81dcca3f7561d6f5976df7ed42e4 (patch) | |
| tree | 1bc529c58a8c85d48056aa2e9c053dc0c3bd392e | |
| parent | 74ebb5376289aff7a31b0a5be922faecedbb1595 (diff) | |
| download | drakx-backup-do-not-use-6f24da26d79b81dcca3f7561d6f5976df7ed42e4.tar drakx-backup-do-not-use-6f24da26d79b81dcca3f7561d6f5976df7ed42e4.tar.gz drakx-backup-do-not-use-6f24da26d79b81dcca3f7561d6f5976df7ed42e4.tar.bz2 drakx-backup-do-not-use-6f24da26d79b81dcca3f7561d6f5976df7ed42e4.tar.xz drakx-backup-do-not-use-6f24da26d79b81dcca3f7561d6f5976df7ed42e4.zip | |
(install_acpi_pkgs) install acpi & acpid at once, in only one transaction
(backported from trunk)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/any.pm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index d4c55d85e..bb647641c 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,8 @@ o support lxdm & slim too (#3715, Derek Jennings) o install autologin for lxdm & slim too - drakauth: don't update UsePAM option in sshd configuration +- 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 7b14429a8..9d9930e53 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); |