summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-21 10:26:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-21 10:26:34 +0000
commit8a7b93cfc23f2cef362ae8930896a9887083be4e (patch)
tree9d240cb5f50396b9b9a4ba0956343c7282ea2d76 /perl-install/any.pm
parentdbde2d7bc12f15e415c3ee1442e17aee899b86d7 (diff)
downloaddrakx-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar
drakx-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.gz
drakx-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.bz2
drakx-8a7b93cfc23f2cef362ae8930896a9887083be4e.tar.xz
drakx-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 :)
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm8
1 files changed, 5 insertions, 3 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;
}