summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-22 10:11:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-22 10:11:26 +0000
commitba110b48b47d9e5e39c81c2f508eb71b35a960d1 (patch)
tree1c2efd882cf10289bba1aa9daa209b6a507732f3
parent470ab0a0630bf9308e716efca8c52878ffbb988a (diff)
downloaddrakx-backup-do-not-use-ba110b48b47d9e5e39c81c2f508eb71b35a960d1.tar
drakx-backup-do-not-use-ba110b48b47d9e5e39c81c2f508eb71b35a960d1.tar.gz
drakx-backup-do-not-use-ba110b48b47d9e5e39c81c2f508eb71b35a960d1.tar.bz2
drakx-backup-do-not-use-ba110b48b47d9e5e39c81c2f508eb71b35a960d1.tar.xz
drakx-backup-do-not-use-ba110b48b47d9e5e39c81c2f508eb71b35a960d1.zip
create any::install_bootloader_pkgs() as a simple wrapper around
install_acpi_pkgs() (needed for next commit)
-rw-r--r--perl-install/any.pm8
-rw-r--r--perl-install/install/steps.pm2
2 files changed, 8 insertions, 2 deletions
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});