diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-18 08:50:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-18 08:50:58 +0000 |
| commit | 92e3fce63a0c18a7e84fe025f88dc779ddcf2cec (patch) | |
| tree | 778e3be78b0e0670acc755cd7678f7f715994eaa /perl-install | |
| parent | ed69d6328f6201595bcbcfe118a88ceea4274611 (diff) | |
| download | drakx-backup-do-not-use-92e3fce63a0c18a7e84fe025f88dc779ddcf2cec.tar drakx-backup-do-not-use-92e3fce63a0c18a7e84fe025f88dc779ddcf2cec.tar.gz drakx-backup-do-not-use-92e3fce63a0c18a7e84fe025f88dc779ddcf2cec.tar.bz2 drakx-backup-do-not-use-92e3fce63a0c18a7e84fe025f88dc779ddcf2cec.tar.xz drakx-backup-do-not-use-92e3fce63a0c18a7e84fe025f88dc779ddcf2cec.zip | |
create install_acpi_pkgs() and use it for auto_installs
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 17 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index dde3c9789..df244b8ff 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -78,6 +78,15 @@ sub hdInstallPath() { defined $tail && ($head ? "$head/$tail" : "/mnt/hd/$tail"); } +sub install_acpi_pkgs { + my ($do_pkgs, $b) = @_; + + my $acpi = bootloader::get_append($b, 'acpi') or return; + if (!member($acpi, 'off', 'ht')) { + $do_pkgs->install('acpi', 'acpid') if !(-x "$::prefix/usr/bin/acpi" && -x "$::prefix/usr/sbin/acpid") + } +} + sub setupBootloader { my ($in, $b, $all_hds, $fstab, $security) = @_; @@ -98,13 +107,9 @@ 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); + install_acpi_pkgs($in->do_pkgs, $b); - 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") - } - } + bootloader::install($b, $all_hds); } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index fb75f630a..04b1f55a0 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -886,6 +886,8 @@ sub setupBootloaderBefore { sub setupBootloader { my ($o) = @_; + any::install_acpi_pkgs($o->do_pkgs, $o->{bootloader}); + require bootloader; bootloader::install($o->{bootloader}, $o->{all_hds}); } |