summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Planel <nplanel@mandriva.com>2003-08-27 17:06:41 +0000
committerNicolas Planel <nplanel@mandriva.com>2003-08-27 17:06:41 +0000
commitfa027e3a197012e6e339ad778c695574fa02bbc8 (patch)
tree5035846a7957f127cafe1da3797567fb733da487
parenta66fab06c4540eedb699ebfc672f6e5c0143d16c (diff)
downloaddrakx-fa027e3a197012e6e339ad778c695574fa02bbc8.tar
drakx-fa027e3a197012e6e339ad778c695574fa02bbc8.tar.gz
drakx-fa027e3a197012e6e339ad778c695574fa02bbc8.tar.bz2
drakx-fa027e3a197012e6e339ad778c695574fa02bbc8.tar.xz
drakx-fa027e3a197012e6e339ad778c695574fa02bbc8.zip
fixup last hack
-rw-r--r--perl-install/install_steps.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 905eaa1b2..add08b0c5 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -729,8 +729,10 @@ sub summaryAfter {
my ($o) = @_;
require bootloader;
- bootloader::get_append($o->{bootloader}, 'acpi') ne 'off' && ne 'ht' && !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")
- and $o->do_pkgs->install(qw(acpi acpid));
+ my $acpi = bootloader::get_append($o->{bootloader}, 'acpi');
+ if ($acpi ne 'off' && $acpi ne 'ht' && !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")) {
+ $o->do_pkgs->install(qw(acpi acpid));
+ }
}
#------------------------------------------------------------------------------