summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-06 13:31:12 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-06 13:31:12 +0000
commitbd497b83a256bd86b0ce8ab2697ea1267e4148f3 (patch)
tree9cf6193a38e0e7072c7291fed1de5d3db0f84a13
parent6ca810f93c5f5c9328c2dfc3265f485336c0d969 (diff)
downloaddrakx-backup-do-not-use-bd497b83a256bd86b0ce8ab2697ea1267e4148f3.tar
drakx-backup-do-not-use-bd497b83a256bd86b0ce8ab2697ea1267e4148f3.tar.gz
drakx-backup-do-not-use-bd497b83a256bd86b0ce8ab2697ea1267e4148f3.tar.bz2
drakx-backup-do-not-use-bd497b83a256bd86b0ce8ab2697ea1267e4148f3.tar.xz
drakx-backup-do-not-use-bd497b83a256bd86b0ce8ab2697ea1267e4148f3.zip
make sure acpi is installed.
-rw-r--r--perl-install/any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ad55cfde4..288ce6917 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -310,8 +310,8 @@ sub setupBootloader__general {
bootloader::set_profiles($b, $profiles);
bootloader::set_append($b, "mem", $memsize);
if ($force_acpi) {
- $in->do_pkgs->ensure_is_installed('acpi', "/usr/bin/acpi", 1) or $force_acpi = 0;
- $in->do_pkgs->ensure_is_installed('acpid', "/usr/sbin/acpid", 1) or $force_acpi = 0;
+ $in->do_pkgs->install(qw(acpi acpid));
+ -x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid" or $force_acpi = 0;
$force_acpi or log::l("deactivating acpi as no acpi nor acpid packages are present");
}
if ($prev_force_acpi != $force_acpi) {