diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-03-18 20:49:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-03-18 20:49:31 +0000 |
| commit | ac9999ebd4e9e814f981a4814853f6ed4e0c707c (patch) | |
| tree | 086fa05a1d80f4861bcf974e380e21ea19a2058a | |
| parent | 46f0889de256b4bf7c53c5293ed451d0b908857c (diff) | |
| download | drakx-ac9999ebd4e9e814f981a4814853f6ed4e0c707c.tar drakx-ac9999ebd4e9e814f981a4814853f6ed4e0c707c.tar.gz drakx-ac9999ebd4e9e814f981a4814853f6ed4e0c707c.tar.bz2 drakx-ac9999ebd4e9e814f981a4814853f6ed4e0c707c.tar.xz drakx-ac9999ebd4e9e814f981a4814853f6ed4e0c707c.zip | |
do "doPartitionDisks" and "formatPartitions" ASAP in upgrade so that miscellaneous is runned when /mnt is mounted (bugzilla #8678)
| -rw-r--r-- | perl-install/install2.pm | 5 |
1 files changed, 4 insertions, 1 deletions
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}; } } |