From f902492a01c974283c9c800ddbd5de651c474c25 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 27 Sep 1999 20:52:11 +0000
Subject: no_comment

---
 perl-install/install_steps_interactive.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

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";
+    }
 }
 
 #------------------------------------------------------------------------------
-- 
cgit v1.2.1