From 0d5483b8c9fb77e640221833b22a0353434e1e6a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 6 Jan 2003 18:32:20 +0000
Subject: (selectKeyboard): read existing keyboard config even if not upgrading
 (it won't do anything when not upgrading :) (selectInstallClass): do not move
 step doPartitionDisks after setupSCSI on upgrade (since the "upgrade" part of
 the job of doPartitionDisks is now done in selectInstallClass) (selectMouse):
 "addToBeDone mouse::write()" was done only on upgrade, replace it with an
 "addToBeDone" done in any case which only does "mouse::write()" if
 $o->{isUpgrade} is set (since isUpgrade *will* be set correctly but is not
 set at this step)

---
 perl-install/install2.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9d6eb07c1..ff73fb305 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -100,7 +100,7 @@ sub selectMouse {
 
     installStepsCall($o, $auto, 'selectMouse', !$first_time || $clicked);
 
-    addToBeDone { mouse::write($o, $o->{mouse}) } 'installPackages' if !$o->{isUpgrade} || $clicked;
+    addToBeDone { mouse::write($o, $o->{mouse}) if !$o->{isUpgrade} || $clicked } 'installPackages';
 }
 
 #------------------------------------------------------------------------------
@@ -126,7 +126,7 @@ sub selectKeyboard {
 	if (my $keyboard = keyboard::read()) {
 	    $o->{keyboard} = $keyboard;
 	}
-    } 'formatPartitions' if $o->{isUpgrade};
+    } 'formatPartitions';
 }
 
 #------------------------------------------------------------------------------
@@ -136,8 +136,6 @@ sub selectInstallClass {
     installStepsCall($o, $auto, 'selectInstallClass', $clicked);
 
     if ($o->{isUpgrade}) {
-	@{$o->{orderedSteps}} = map { /setupSCSI/ ? ($_, "doPartitionDisks") : $_ }
-	                        grep { !/doPartitionDisks/ } @{$o->{orderedSteps}};
 	$o->{keepConfiguration} and @{$o->{orderedSteps}} = grep { !/selectMouse|selectKeyboard|miscellaneous|setRootPassword|addUser|configureNetwork|installUpdates|summary|configureServices|configureX/ } @{$o->{orderedSteps}};
 	my $s; foreach (@{$o->{orderedSteps}}) {
 	    $s->{next} = $_ if $s;
-- 
cgit v1.2.1