summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-14 22:05:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-14 22:05:10 +0000
commita812d518a577c05d6e88ed8326a0d71b9d48664e (patch)
tree001b9e98bcca633014565b280c4bfaeb9d90f7ad
parentdbcb3dde3525aac3d97d310efe0f42256dc36260 (diff)
downloaddrakx-a812d518a577c05d6e88ed8326a0d71b9d48664e.tar
drakx-a812d518a577c05d6e88ed8326a0d71b9d48664e.tar.gz
drakx-a812d518a577c05d6e88ed8326a0d71b9d48664e.tar.bz2
drakx-a812d518a577c05d6e88ed8326a0d71b9d48664e.tar.xz
drakx-a812d518a577c05d6e88ed8326a0d71b9d48664e.zip
ensure cancel on setupBootloader__mbr_or_not do cancel
-rw-r--r--perl-install/any.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index e2329b0ef..6d5ceefe1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -102,7 +102,7 @@ sub setupBootloader_simple {
$mixed_kind_of_disks || $b->{bootUnsafe} || arch() =~ /ppc/ or return 1; #- default is good enough
if (!$mixed_kind_of_disks && arch() !~ /ia64/) {
- setupBootloader__mbr_or_not($in, $b, $hds, $fstab);
+ setupBootloader__mbr_or_not($in, $b, $hds, $fstab) or return 0;
} else {
general:
setupBootloader__general($in, $b, $all_hds, $fstab, $security) or return 0;
@@ -148,7 +148,7 @@ sub setupBootloader__mbr_or_not {
my $use_partition = arch() =~ /sparc/ ? $b->{use_partition} : "/dev/$boot" ne $b->{boot};
$in->ask_from(arch() =~ /sparc/ ? N("SILO Installation") : N("LILO/grub Installation"),
N("Where do you want to install the bootloader?"),
- [ { val => \$use_partition, list => [ 0, 1 ], format => sub { translate($l[$_[0]]) } } ]);
+ [ { val => \$use_partition, list => [ 0, 1 ], format => sub { translate($l[$_[0]]) } } ]) or return;
if (arch() =~ /sparc/) {
$b->{use_partition} = $use_partition;
} else {
@@ -160,6 +160,7 @@ sub setupBootloader__mbr_or_not {
$b->{boot} = $new_boot;
}
}
+ 1;
}
sub setupBootloader__general {