summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-15 11:21:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-15 11:21:55 +0000
commit8b606ca75db47a948c183893889b2803217062d3 (patch)
treef2c6d36be442606b9db0636cf3358bed746bbb4e /perl-install/install2.pm
parent5b58f511e649e6b924ddcedaea96dbd8f705c6d8 (diff)
downloaddrakx-8b606ca75db47a948c183893889b2803217062d3.tar
drakx-8b606ca75db47a948c183893889b2803217062d3.tar.gz
drakx-8b606ca75db47a948c183893889b2803217062d3.tar.bz2
drakx-8b606ca75db47a948c183893889b2803217062d3.tar.xz
drakx-8b606ca75db47a948c183893889b2803217062d3.zip
- we do want doPartitionDisks and formatPartitions to be done early on upgrade,
so that selectKeyboard is done when the partitions are mounted - call set_all_default() (to fix fstab on upgrade) before install packages so that {useSupermount} is correctly set (maybe we could also move the set_all_default on install there)
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 599e7ffb7..220114975 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -140,6 +140,10 @@ sub selectInstallClass {
installStepsCall($o, $auto, 'selectInstallClass');
if ($o->{isUpgrade}) {
+ @{$o->{orderedSteps}} = uniq(map {
+ $_ eq 'selectInstallClass' ? ($_, 'doPartitionDisks', 'formatPartitions') : $_;
+ } @{$o->{orderedSteps}});
+
$o->{modules_conf}->merge_into(modules::any_conf->read);
}
}