From 5760b0624e1023dd3b43f8ac6790915c2a2bde62 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 6 Nov 2000 19:18:10 +0000
Subject: (formatPartitions): formatMountPartitions done even in upgrade

---
 perl-install/install2.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'perl-install')

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';
     }
 
-- 
cgit v1.2.1