summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-07 22:25:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-07 22:25:37 +0000
commit807dc2042bd2f5d35d51bbd47a24b5599eabb980 (patch)
tree12d210e3419e5f7ba324a6ac82972f76548ef1ab
parent3d8f88d8ed6c648233297aca4564e7d98f831db5 (diff)
downloaddrakx-backup-do-not-use-807dc2042bd2f5d35d51bbd47a24b5599eabb980.tar
drakx-backup-do-not-use-807dc2042bd2f5d35d51bbd47a24b5599eabb980.tar.gz
drakx-backup-do-not-use-807dc2042bd2f5d35d51bbd47a24b5599eabb980.tar.bz2
drakx-backup-do-not-use-807dc2042bd2f5d35d51bbd47a24b5599eabb980.tar.xz
drakx-backup-do-not-use-807dc2042bd2f5d35d51bbd47a24b5599eabb980.zip
"require bootloader" where needed
-rw-r--r--perl-install/any.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e08924bab..b1d4aad84 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -78,6 +78,7 @@ sub setupBootloader {
my ($in, $b, $all_hds, $fstab, $security) = @_;
my $hds = $all_hds->{hds};
+ require bootloader;
general:
setupBootloader__general($in, $b, $all_hds, $fstab, $security) or return 0;
setupBootloader__boot_bios_drive($in, $b, $hds) or goto general;
@@ -90,6 +91,7 @@ sub setupBootloader_simple {
my ($in, $b, $all_hds, $fstab, $security) = @_;
my $hds = $all_hds->{hds};
+ require bootloader;
my $mixed_kind_of_disks = bootloader::mixed_kind_of_disks($hds);
#- full expert questions when there is 2 kind of disks
#- it would need a semi_auto asking on which drive the bios boots...
@@ -297,7 +299,6 @@ if_(arch() !~ /sparc|ppc|ia64/,
} } }, \@l) or return;
$b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
- require bootloader;
bootloader::configure_entry($e); #- hack to make sure initrd file are built.
1;
};