From 6908cd93e661b2838afcc2fd8823906acaae731e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 6 Nov 2000 17:05:31 +0000
Subject: (doPartitionDisks): use $o->{partitioning}{use_existing_root}

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

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 37cc627f4..2b14adc4b 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -172,11 +172,12 @@ sub doPartitionDisks {
 
     install_any::getHds($o);
 
-    if ($o->{isUpgrade}) {
+    if ($o->{partitioning}{use_existing_root} || $o->{isUpgrade}) {
 	# either one root is defined (and all is ok), or we take the first one we find
 	my $p = fsedit::get_root_($o->{fstab}) || first(install_any::find_root_parts($o->{hds}, $o->{prefix})) or die;
 	install_any::use_root_part($o->{fstab}, $p, $o->{prefix});
-    } elsif ($o->{partitioning}{auto_allocate}) {
+    } 
+    if ($o->{partitioning}{auto_allocate}) {
 	fsedit::auto_allocate($o->{hds}, $o->{partitions});
     }
 }
-- 
cgit v1.2.1