summaryrefslogtreecommitdiffstats
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
parent5b58f511e649e6b924ddcedaea96dbd8f705c6d8 (diff)
downloaddrakx-backup-do-not-use-8b606ca75db47a948c183893889b2803217062d3.tar
drakx-backup-do-not-use-8b606ca75db47a948c183893889b2803217062d3.tar.gz
drakx-backup-do-not-use-8b606ca75db47a948c183893889b2803217062d3.tar.bz2
drakx-backup-do-not-use-8b606ca75db47a948c183893889b2803217062d3.tar.xz
drakx-backup-do-not-use-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)
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/install_steps.pm8
2 files changed, 11 insertions, 1 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);
}
}
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1a9f8aa70..f47cc8c8a 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -197,7 +197,7 @@ sub doPartitionDisksAfter {
fs::set_removable_mntpoints($o->{all_hds});
fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale}))
- if !$o->{isUpgrade} || $o->{isUpgrade} =~ /redhat|conectiva/;
+ if !$o->{isUpgrade};
$o->{fstab} = [ fs::get::fstab($o->{all_hds}) ];
@@ -397,6 +397,12 @@ sub beforeInstallPackages {
upgrading_redhat();
}
+ if ($o->{isUpgrade} =~ /redhat|conectiva/) {
+ #- to ensure supermount is removed for cds
+ fs::mount_options::set_all_default($o->{all_hds}, %$o, lang::fs_options($o->{locale}));
+ }
+
+
#- some packages need such files for proper installation.
install_any::write_fstab($o);