diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2005-04-06 12:08:42 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2005-04-06 12:08:42 +0000 |
commit | b4d82a9ebac9814c1c2640c8fb12a340627d550b (patch) | |
tree | 0d702f5c20729956d98fe477ad7f4e75ef15f25f /perl-install/install2.pm | |
parent | c76590fa6bbc31bf66aca3a5da115efd27a93839 (diff) | |
download | drakx-b4d82a9ebac9814c1c2640c8fb12a340627d550b.tar drakx-b4d82a9ebac9814c1c2640c8fb12a340627d550b.tar.gz drakx-b4d82a9ebac9814c1c2640c8fb12a340627d550b.tar.bz2 drakx-b4d82a9ebac9814c1c2640c8fb12a340627d550b.tar.xz drakx-b4d82a9ebac9814c1c2640c8fb12a340627d550b.zip |
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)
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r-- | perl-install/install2.pm | 4 |
1 files changed, 3 insertions, 1 deletions
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}; |