summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-12-04 11:28:50 +0000
committerFrancois Pons <fpons@mandriva.com>2001-12-04 11:28:50 +0000
commitcaee62ed41694df1e49f7e4b219343649c5e4115 (patch)
tree8dc5a8ba2a43ef48dec1da192c26d22a64e4131c
parent432169003898362feb8de468f691065a6b777e92 (diff)
downloaddrakx-caee62ed41694df1e49f7e4b219343649c5e4115.tar
drakx-caee62ed41694df1e49f7e4b219343649c5e4115.tar.gz
drakx-caee62ed41694df1e49f7e4b219343649c5e4115.tar.bz2
drakx-caee62ed41694df1e49f7e4b219343649c5e4115.tar.xz
drakx-caee62ed41694df1e49f7e4b219343649c5e4115.zip
make sure lilo is installed on automatic mode.
-rw-r--r--perl-install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 9e459af1c..ffd908f63 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -107,7 +107,7 @@ sub setupBootloader {
if (arch() =~ /sparc/) {
$b->{use_partition} = $in->ask_from_list_(_("SILO Installation"),
_("Where do you want to install the bootloader?"),
- \@l, $l[$b->{use_partition}]) or return;
+ \@l, $l[$b->{use_partition}]) or return 0;
} elsif (arch() =~ /ppc/) {
if (defined $partition_table_mac::bootstrap_part) {
$b->{boot} = $partition_table_mac::bootstrap_part;
@@ -197,7 +197,7 @@ sub setupBootloader {
$b->{methods}{$_} = 0 foreach keys %{$b->{methods}};
$bootloaders{$bootloader} and $bootloaders{$bootloader}->();
#- at least one method
- grep_each { $::b } %{$b->{methods}} or return;
+ grep_each { $::b } %{$b->{methods}} or return 0;
$b->{use_partition} = $silo_install_lang eq _("First sector of drive (MBR)") ? 0 : 1;
$b->{vga} = $bootloader::vga_modes{$b->{vga}} || $b->{vga};
@@ -206,7 +206,7 @@ sub setupBootloader {
bootloader::add_append($b, "mem", $memsize);
}
- $ask_per_entries or return;
+ $ask_per_entries or return 1;
while (1) {
$in->set_help(arch() =~ /sparc/ ? 'setupSILOAddEntry' : arch() =~ /ppc/ ? 'setupYabootAddEntry' : 'setupBootloaderAddEntry') unless $::isStandalone;