diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-11-06 15:56:41 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-11-06 15:56:41 +0000 |
| commit | 4613b6aad9d8df4435b05ec176d944632b11c0cf (patch) | |
| tree | 8224d19b524a105d80ba89b2bf1cfb07f0e40132 | |
| parent | 2ce469f3aafe5ac58fd5a27e1b2642ca8383a08e (diff) | |
| download | drakx-4613b6aad9d8df4435b05ec176d944632b11c0cf.tar drakx-4613b6aad9d8df4435b05ec176d944632b11c0cf.tar.gz drakx-4613b6aad9d8df4435b05ec176d944632b11c0cf.tar.bz2 drakx-4613b6aad9d8df4435b05ec176d944632b11c0cf.tar.xz drakx-4613b6aad9d8df4435b05ec176d944632b11c0cf.zip | |
conditionnal format of / and use already installed packages if any on install.
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
1 files changed, 3 insertions, 1 deletions
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) = @_; |