diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-11-06 17:05:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-11-06 17:05:31 +0000 |
| commit | 6908cd93e661b2838afcc2fd8823906acaae731e (patch) | |
| tree | 0e91567c87011eee663e676d23dae10dd3e702cb /perl-install/install_steps.pm | |
| parent | fa73d7e2f132dcf11014336e85cd9e121f2316dc (diff) | |
| download | drakx-backup-do-not-use-6908cd93e661b2838afcc2fd8823906acaae731e.tar drakx-backup-do-not-use-6908cd93e661b2838afcc2fd8823906acaae731e.tar.gz drakx-backup-do-not-use-6908cd93e661b2838afcc2fd8823906acaae731e.tar.bz2 drakx-backup-do-not-use-6908cd93e661b2838afcc2fd8823906acaae731e.tar.xz drakx-backup-do-not-use-6908cd93e661b2838afcc2fd8823906acaae731e.zip | |
(doPartitionDisks): use $o->{partitioning}{use_existing_root}
Diffstat (limited to 'perl-install/install_steps.pm')
| -rw-r--r-- | perl-install/install_steps.pm | 5 |
1 files changed, 3 insertions, 2 deletions
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}); } } |