summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-27 20:52:11 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-27 20:52:11 +0000
commitf902492a01c974283c9c800ddbd5de651c474c25 (patch)
tree4a8eb59f4644fb18ef8e3a448c79061643b60145 /perl-install/install_steps_interactive.pm
parent73e7a0f1107be369f7304335082afac4f96ee3d2 (diff)
downloaddrakx-f902492a01c974283c9c800ddbd5de651c474c25.tar
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.gz
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.bz2
drakx-f902492a01c974283c9c800ddbd5de651c474c25.tar.xz
drakx-f902492a01c974283c9c800ddbd5de651c474c25.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm13
1 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index ceaa42380..6ccbb8451 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -121,6 +121,9 @@ sub choosePartitionsToFormat($$) {
$o->SUPER::choosePartitionsToFormat($fstab);
my @l = grep { $_->{mntpoint} && !($::beginner && isSwap($_)) } @$fstab;
+
+ return if $::beginner && 0 == grep { ! $_->{toFormat} } @l;
+
$o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
[ map { isSwap($_) ? type2name($_->{type}) . " ($_->{device})" : $_->{mntpoint} } @l ],
[ map { \$_->{toFormat} } @l ]) or die "cancel";
@@ -618,7 +621,7 @@ _("Default") => { val => \$default, type => 'bool' },
);
$o->ask_from_entries_ref('',
- _(""),
+ '',
[ grep_index { even($::i) } @l ],
[ grep_index { odd($::i) } @l ],
) or return;
@@ -628,7 +631,13 @@ _("Default") => { val => \$default, type => 'bool' },
delete $b->{entries}{$old_name};
$b->{entries}{$name} = $e;
}
- $o->SUPER::setupBootloader;
+ eval { $o->SUPER::setupBootloader };
+ if ($@) {
+ $o->ask_warn('',
+ [ _("Lilo failed. The following error occured:"),
+ grep { !/^Warning:/ } cat_("$o->{prefix}/tmp/.error") ]);
+ die "already displayed";
+ }
}
#------------------------------------------------------------------------------