summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:35 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-01-28 23:34:35 +0000
commit7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2 (patch)
treec6fca3c1e87ee31ed8dfc0efb5a720743a3af40a
parentb0c38d2b22823e77b9db4cae26464f7bc3c216c7 (diff)
downloaddrakx-7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2.tar
drakx-7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2.tar.gz
drakx-7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2.tar.bz2
drakx-7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2.tar.xz
drakx-7d2b7cb1e935caa3af72e39c115ecaf6796ebfe2.zip
(choosePartitionsToFormat): fixed horrible bug causing reiserfs partitions
not to be displayed/asked for formatting. The default value being used.
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 2fd5f5b88..e2242e0c0 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -346,7 +346,7 @@ sub choosePartitionsToFormat {
$o->SUPER::choosePartitionsToFormat($fstab);
- my @l = grep { !$_->{isMounted} && !$_->{isFormatted} && $_->{mntpoint} && !(isSwap($_) && !$::expert) &&
+ my @l = grep { !$_->{isMounted} && !$_->{isFormatted} && $_->{mntpoint} && (!isSwap($_) || $::expert) &&
(!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
} @$fstab;
$_->{toFormat} = 1 foreach grep { isSwap($_) && !$::expert } @$fstab;
@@ -370,11 +370,11 @@ sub choosePartitionsToFormat {
({
text => $name2label->($e), type => 'bool',
val => \$e->{toFormatTmp}
- }, {
+ }, if_(!isLoopback($_) && !isReiserfs($_), {
text => $name2label->($e), type => 'bool', advanced => 1,
disabled => sub { !$e->{toFormatTmp} },
val => \$e->{toFormatCheck}
- }) } grep { !isLoopback($_) && !isReiserfs($_) } @l ]
+ })) } @l ]
) or die 'already displayed';
#- ok now we can really set toFormat
$_->{toFormat} = delete $_->{toFormatTmp} foreach @l;