diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-13 03:09:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-13 03:09:36 +0000 |
| commit | afd31bb0f770218ed23053971e7265f26cd925a6 (patch) | |
| tree | 08c21d5defb2a121ee455f4b9c74f8d6c4b19e6c | |
| parent | 7c3fe363be7f427ce33b12186c1b961cc00998ec (diff) | |
| download | drakx-afd31bb0f770218ed23053971e7265f26cd925a6.tar drakx-afd31bb0f770218ed23053971e7265f26cd925a6.tar.gz drakx-afd31bb0f770218ed23053971e7265f26cd925a6.tar.bz2 drakx-afd31bb0f770218ed23053971e7265f26cd925a6.tar.xz drakx-afd31bb0f770218ed23053971e7265f26cd925a6.zip | |
- 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)
| -rw-r--r-- | perl-install/any.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 349606f4c..763ccf4ee 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -99,6 +99,12 @@ sub setupBootloader { eval { run_program::rooted($::prefix, 'lilo', '-u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*"); bootloader::install($b, $all_hds); + + if (my $acpi = bootloader::get_append($b, 'acpi')) { + if (!member($acpi, 'off', 'ht')) { + $in->do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid") + } + } } 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)); - } } #------------------------------------------------------------------------------ |