diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 6 |
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; |