From 7ce14e0f9d8541e16f3e4f88ea6d9b77c3bd19c7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 4 Sep 2000 18:33:56 +0000
Subject: no_comment

---
 perl-install/install2.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 85c6203f3..84c86bdda 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -236,7 +236,7 @@ sub selectKeyboard {
     $::live and return;
     my ($clicked) = $_[0];
 
-    return unless $o->{isUpgrade} || !$::beginner || $clicked;
+    return if !$o->{isUpgrade} && $::beginner && !$clicked;
 
     $o->{keyboard} = keyboard::read($o->{prefix}) if $o->{isUpgrade} && !$clicked && $o->{keyboard_unsafe};
     $o->selectKeyboard;
@@ -273,6 +273,7 @@ sub selectInstallClass {
 sub doPartitionDisks {
     $::live and return;
     $o->{steps}{formatPartitions}{done} = 0;
+    $o->{steps}{doPartitionDisks}{done} = 0;
     $o->doPartitionDisksBefore;
     $o->doPartitionDisks;
     $o->doPartitionDisksAfter;
-- 
cgit v1.2.1