diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-08-11 13:17:17 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-08-11 13:17:17 +0000 |
| commit | 52acde1b1fdb9c845cfa2162cdad4086af137930 (patch) | |
| tree | b14493440ba8640a1e284866cda72817c9c7a0ac | |
| parent | 96179a62f26819b22496e01753b7a3e17d723c20 (diff) | |
| download | drakx-52acde1b1fdb9c845cfa2162cdad4086af137930.tar drakx-52acde1b1fdb9c845cfa2162cdad4086af137930.tar.gz drakx-52acde1b1fdb9c845cfa2162cdad4086af137930.tar.bz2 drakx-52acde1b1fdb9c845cfa2162cdad4086af137930.tar.xz drakx-52acde1b1fdb9c845cfa2162cdad4086af137930.zip | |
when any::setupBootloader_simple() fail, use any::setupBootloader() afterwards
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 281ae1b5c..5b9aeb6eb 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -279,7 +279,7 @@ sub setupBootloader { modules::write_conf($o->{prefix}); installStepsCall($o, $auto, 'setupBootloaderBefore') if $ent_number == 1; - installStepsCall($o, $auto, 'setupBootloader'); + installStepsCall($o, $auto, 'setupBootloader', $ent_number); eval { install_any::set_security($o) }; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index ebf60d96f..79ea5151a 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1180,7 +1180,7 @@ sub setupBootloaderBefore { #------------------------------------------------------------------------------ sub setupBootloader { - my ($o) = @_; + my ($o, $ent_number) = @_; if (arch() =~ /ppc/) { my $machtype = detect_devices::get_mac_generation(); if ($machtype !~ /NewWorld/) { @@ -1197,7 +1197,11 @@ N("Error installing aboot, try to force installation even if that destroys the first partition?")); }; } else { - any::setupBootloader_simple($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; + if ($ent_number == 1) { + any::setupBootloader_simple($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; + } else { + any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; + } { my $_w = $o->wait_message('', N("Installing bootloader")); |