diff options
| -rw-r--r-- | perl-install/install/NEWS | 4 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 18db660f0..4eb886a74 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,7 @@ +- bootloader: + o do not apply bootloader settings before giving user the option to change + them (#57471) + Version 13.15 - 17 March 2010 - summary: diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 04abbb542..44bec8571 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -847,7 +847,6 @@ sub summary { }, clicked => sub { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; - any::installBootloader($o, $o->{bootloader}, $o->{all_hds}); }, } if !$::local_install; @@ -1000,6 +999,7 @@ sub summary { $o->summary_prompt(\@l, $check_complete); + any::installBootloader($o, $o->{bootloader}, $o->{all_hds}) if !$::local_install; install::steps::configureTimezone($o) if !$timezone_manually_set; #- do not forget it. } @@ -1042,7 +1042,6 @@ sub setupBootloader { } { any::setupBootloader_simple($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; - any::installBootloader($o, $o->{bootloader}, $o->{all_hds}) or die "already displayed"; } } |