summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-28 20:42:12 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-28 20:42:12 +0000
commit2ee78f3a9058098c7bdb9085bc5872662459755f (patch)
tree3a9dfb55c263775fee7b8e59d48cd910c532f30e
parent65eefc2b6783f83b7ad331cddf925ce6fe3828e0 (diff)
downloaddrakx-2ee78f3a9058098c7bdb9085bc5872662459755f.tar
drakx-2ee78f3a9058098c7bdb9085bc5872662459755f.tar.gz
drakx-2ee78f3a9058098c7bdb9085bc5872662459755f.tar.bz2
drakx-2ee78f3a9058098c7bdb9085bc5872662459755f.tar.xz
drakx-2ee78f3a9058098c7bdb9085bc5872662459755f.zip
propose to format / and /usr even if isFormatted. More generally do not trust isFormatted to show which partitions to format
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/install_steps_interactive.pm7
2 files changed, 8 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1d4430359..769ac6871 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -225,9 +225,11 @@ sub choosePartitionsToFormat($$) {
$_->{mntpoint} or next;
add2hash_($_, { toFormat => $_->{notFormatted} });
+ $_->{toFormatUnsure} = member($_->{mntpoint}, '/', '/usr');
+
if (!$_->{toFormat}) {
my $t = fsedit::typeOfPart($_->{device});
- $_->{toFormatUnsure} = member($_->{mntpoint}, '/', '/usr') ||
+ $_->{toFormatUnsure} ||=
#- 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});
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5b892e3eb..3954d9ad1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -386,7 +386,7 @@ sub choosePartitionsToFormat {
$o->SUPER::choosePartitionsToFormat($fstab);
- my @l = grep { !$_->{isMounted} && !$_->{isFormatted} && $_->{mntpoint} && (!isSwap($_) || $::expert) &&
+ my @l = grep { !$_->{isMounted} && $_->{mntpoint} && (!isSwap($_) || $::expert) &&
(!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
} @$fstab;
$_->{toFormat} = 1 foreach grep { isSwap($_) && !$::expert } @$fstab;
@@ -412,7 +412,10 @@ sub choosePartitionsToFormat {
})) } @l ]
) or die 'already displayed';
#- ok now we can really set toFormat
- $_->{toFormat} = delete $_->{toFormatTmp} foreach @l;
+ foreach (@l) {
+ $_->{toFormat} = delete $_->{toFormatTmp};
+ $_->{isFormatted} = 0;
+ }
}