diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-21 10:26:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-21 10:26:34 +0000 |
| commit | 8a7b93cfc23f2cef362ae8930896a9887083be4e (patch) | |
| tree | 9d240cb5f50396b9b9a4ba0956343c7282ea2d76 | |
| parent | dbde2d7bc12f15e415c3ee1442e17aee899b86d7 (diff) | |
| download | drakx-backup-do-not-use-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar drakx-backup-do-not-use-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.gz drakx-backup-do-not-use-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.bz2 drakx-backup-do-not-use-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.xz drakx-backup-do-not-use-8a7b93cfc23f2cef362ae8930896a9887083be4e.zip | |
- when skipping bootloader installation, correctly say "None" in summary
(#39101)
for this, setting $bootloader->{boot} to '', it's simple enough and seems to
work nicely :)
| -rw-r--r-- | perl-install/any.pm | 8 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 3f067b971..366309ef2 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -322,6 +322,8 @@ On which drive are you booting?"), \&partition_table::description, $hds) or retu sub setupBootloader__mbr_or_not { my ($in, $b, $hds, $fstab) = @_; + log::l("setupBootloader__mbr_or_not"); + if (arch() =~ /ppc/) { if (defined $partition_table::mac::bootstrap_part) { $b->{boot} = $partition_table::mac::bootstrap_part; @@ -352,11 +354,11 @@ sub setupBootloader__mbr_or_not { interactive_help_id => 'setupBootloaderBeginner', }, [ { val => \$default, list => \@l, format => sub { $_[0][0] }, type => 'list' } ]); - my $new_boot = $default->[1] or return; + my $new_boot = $default->[1]; #- remove bios mapping if the user changed the boot device - delete $b->{bios} if $new_boot ne $b->{boot}; - $b->{boot} = $new_boot; + delete $b->{bios} if $new_boot && $new_boot ne $b->{boot}; + $b->{boot} = $new_boot or return; } 1; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 9b6b654f6..1d08f91a6 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- when skipping bootloader installation, correctly say "None" in summary + (#39101) - correctly set country when given lang=xxx on /proc/cmdline (regression introduced in 10.16) (#39104) diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 9bdd47883..9fcc91370 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -824,7 +824,7 @@ sub summary { label => N("Bootloader"), val => sub { #-PO: example: lilo-graphic on /dev/hda1 - N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}); + $o->{bootloader}{boot} ? N("%s on %s", $o->{bootloader}{method}, $o->{bootloader}{boot}) : N("None"); }, clicked => sub { any::setupBootloader($o, $o->{bootloader}, $o->{all_hds}, $o->{fstab}, $o->{security}) or return; |