summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-11-06 19:18:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-11-06 19:18:10 +0000
commit5760b0624e1023dd3b43f8ac6790915c2a2bde62 (patch)
treef159d758d32c777511ce3c5dbe3cb2f64471548b
parent564a4273821d765928c935204005dafacd7b56b1 (diff)
downloaddrakx-5760b0624e1023dd3b43f8ac6790915c2a2bde62.tar
drakx-5760b0624e1023dd3b43f8ac6790915c2a2bde62.tar.gz
drakx-5760b0624e1023dd3b43f8ac6790915c2a2bde62.tar.bz2
drakx-5760b0624e1023dd3b43f8ac6790915c2a2bde62.tar.xz
drakx-5760b0624e1023dd3b43f8ac6790915c2a2bde62.zip
(formatPartitions): formatMountPartitions done even in upgrade
-rw-r--r--perl-install/install2.pm8
1 files changed, 3 insertions, 5 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 339306a6c..f1e3e4d62 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -272,10 +272,9 @@ sub doPartitionDisks {
sub formatPartitions {
$o->{steps}{choosePackages}{done} = 0;
- unless ($o->{isUpgrade}) {
- $o->choosePartitionsToFormat($o->{fstab});
- $o->formatMountPartitions($o->{fstab}) unless $::testing;
- }
+ $o->choosePartitionsToFormat($o->{fstab}) unless $o->{isUpgrade};
+ $o->formatMountPartitions($o->{fstab}) unless $::testing;
+
mkdir "$o->{prefix}/$_", 0755 foreach
qw(dev etc etc/profile.d etc/sysconfig etc/sysconfig/console etc/sysconfig/network-scripts
home mnt tmp var var/tmp var/lib var/lib/rpm var/lib/urpmi);
@@ -608,7 +607,6 @@ sub main {
$o->{partitioning}{use_existing_root} = 1;
$o->{partitioning}{auto_allocate} = 1;
$o->{compssListLevel} = 50;
- $o->{doNotFormatRootByDefault} = 1;
push @auto, 'selectInstallClass', 'selectMouse', 'doPartitionDisks', 'choosePackages', 'configureTimezone', 'exitInstall';
}