From 4613b6aad9d8df4435b05ec176d944632b11c0cf Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 6 Nov 2000 15:56:41 +0000
Subject: conditionnal format of / and use already installed packages if any on
 install.

---
 perl-install/install_steps.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 6efde2f53..37cc627f4 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -221,7 +221,7 @@ sub choosePartitionsToFormat($$) {
 	    my $t = isLoopback($_) ? 
 	      eval { fsedit::typeOfPart($o->{prefix} . loopback::file($_)) } :
 	      fsedit::typeOfPart($_->{device});
-	    $_->{toFormatUnsure} = $_->{mntpoint} eq "/" ||
+	    $_->{toFormatUnsure} = $_->{mntpoint} eq "/" && !$o->{doNotFormatRootByDefault} ||
 	      #- if detected dos/win, it's not precise enough to just compare the types (too many of them)
 	      (!$t || isOtherAvailableFS({ type => $t }) ? !isOtherAvailableFS($_) : $t != $_->{type});
 	}
@@ -237,6 +237,8 @@ sub formatMountPartitions {
 sub setPackages {
     my ($o) = @_;
     install_any::setPackages($o);
+    pkgs::selectPackagesAlreadyInstalled($o->{packages}, $o->{prefix})
+	if -r "$o->{prefix}/var/lib/rpm/packages.rpm" && !$o->{isUpgrade};
 }
 sub selectPackagesToUpgrade {
     my ($o) = @_;
-- 
cgit v1.2.1