From ac9999ebd4e9e814f981a4814853f6ed4e0c707c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 18 Mar 2005 20:49:31 +0000
Subject: do "doPartitionDisks" and "formatPartitions" ASAP in upgrade so that
 miscellaneous is runned when /mnt is mounted (bugzilla #8678)

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 49f6b6b10..d66c58f1d 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -142,7 +142,10 @@ sub selectInstallClass {
     installStepsCall($o, $auto, 'selectInstallClass', $clicked);
 
     if ($o->{isUpgrade}) {
-	$o->{keepConfiguration} and @{$o->{orderedSteps}} = grep { !/selectMouse|selectKeyboard|miscellaneous|setRootPassword|addUser|configureNetwork|installUpdates|summary|configureServices|configureX/ } @{$o->{orderedSteps}};
+	@{$o->{orderedSteps}} = uniq('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