From ba110b48b47d9e5e39c81c2f508eb71b35a960d1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 22 Aug 2008 10:11:26 +0000 Subject: create any::install_bootloader_pkgs() as a simple wrapper around install_acpi_pkgs() (needed for next commit) --- perl-install/any.pm | 8 +++++++- perl-install/install/steps.pm | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/any.pm b/perl-install/any.pm index e1046abc5..6073447fb 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -103,6 +103,12 @@ sub add_users { } } +sub install_bootloader_pkgs { + my ($do_pkgs, $b) = @_; + + install_acpi_pkgs($do_pkgs, $b); +} + sub install_acpi_pkgs { my ($do_pkgs, $b) = @_; @@ -236,7 +242,7 @@ sub setupBootloaderUntilInstalled { sub installBootloader { my ($in, $b, $all_hds) = @_; return if detect_devices::is_xbox(); - install_acpi_pkgs($in->do_pkgs, $b); + install_bootloader_pkgs($in->do_pkgs, $b); eval { run_program::rooted($::prefix, 'echo | lilo -u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*"); diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index 412e027e8..856e59586 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -765,7 +765,7 @@ sub setupBootloaderBefore { sub setupBootloader { my ($o) = @_; - any::install_acpi_pkgs($o->do_pkgs, $o->{bootloader}); + any::install_bootloader_pkgs($o->do_pkgs, $o->{bootloader}); require bootloader; bootloader::install($o->{bootloader}, $o->{all_hds}); -- cgit v1.2.1