diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2001-08-28 20:42:12 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2001-08-28 20:42:12 +0000 |
commit | 2ee78f3a9058098c7bdb9085bc5872662459755f (patch) | |
tree | 3a9dfb55c263775fee7b8e59d48cd910c532f30e /perl-install/install_steps_interactive.pm | |
parent | 65eefc2b6783f83b7ad331cddf925ce6fe3828e0 (diff) | |
download | drakx-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
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
1 files changed, 5 insertions, 2 deletions
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; + } } |