From afd31bb0f770218ed23053971e7265f26cd925a6 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 13 Aug 2004 03:09:36 +0000 Subject: - move installing acpi and acpid directly in any::setupBootloader() instead of doing it in summaryAfter(), that way acpi and acpid are installed in drakboot (bugzilla #10760) - if no acpi parameter, don't try installing acpi & acpid (fix for ppc) --- perl-install/install_steps.pm | 6 ------ 1 file changed, 6 deletions(-) (limited to 'perl-install/install_steps.pm') diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f1539b655..0153a23a4 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -688,12 +688,6 @@ sub summary { sub summaryAfter { my ($o) = @_; - - require bootloader; - my $acpi = bootloader::get_append($o->{bootloader}, 'acpi'); - if (!member($acpi, 'off', 'ht') && !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid")) { - $o->do_pkgs->install(qw(acpi acpid)); - } } #------------------------------------------------------------------------------ -- cgit v1.2.1