From b4d82a9ebac9814c1c2640c8fb12a340627d550b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 6 Apr 2005 12:08:42 +0000
Subject: when re-ordering the steps to have doPartitionDisks just after
 selectInstallClass in case of upgrade, do it properly so that the
 "Partitioning lamp" behaves properly (bugzilla #15040)

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

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d66c58f1d..c928fd686 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -142,7 +142,9 @@ sub selectInstallClass {
     installStepsCall($o, $auto, 'selectInstallClass', $clicked);
 
     if ($o->{isUpgrade}) {
-	@{$o->{orderedSteps}} = uniq('doPartitionDisks', 'formatPartitions', @{$o->{orderedSteps}});
+	@{$o->{orderedSteps}} = uniq(map {
+	    $_ eq 'selectInstallClass' ? ($_, 'doPartitionDisks', 'formatPartitions') : $_;
+	} @{$o->{orderedSteps}});
 
 	@{$o->{orderedSteps}} = difference2($o->{orderedSteps}, [ qw(selectMouse selectKeyboard miscellaneous formatPartitions setRootPassword addUser configureNetwork installUpdates summary configureServices configureX) ])
 	  if $o->{keepConfiguration};
-- 
cgit v1.2.1