summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-09-03 09:41:43 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-09-03 09:41:43 +0000
commit0f2062a43fc7c703deb84874426fb2af94a5ec6e (patch)
tree60caa464291aabd638a3095d312cc5610dc49dbb /perl-install
parent93512bcbb9b34babfb2c97385f48e81936a1b625 (diff)
downloaddrakx-0f2062a43fc7c703deb84874426fb2af94a5ec6e.tar
drakx-0f2062a43fc7c703deb84874426fb2af94a5ec6e.tar.gz
drakx-0f2062a43fc7c703deb84874426fb2af94a5ec6e.tar.bz2
drakx-0f2062a43fc7c703deb84874426fb2af94a5ec6e.tar.xz
drakx-0f2062a43fc7c703deb84874426fb2af94a5ec6e.zip
(choosePartitionsToFormat): do not propose to propose already formatted
fat partitions
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps_interactive.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 0ca76a230..3bf701909 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -370,8 +370,10 @@ sub choosePartitionsToFormat {
$o->SUPER::choosePartitionsToFormat($fstab);
- my @l = grep { !$_->{isMounted} && $_->{mntpoint} && (!isSwap($_) || $::expert) &&
- (!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
+ my @l = grep { !$_->{isMounted} && $_->{mntpoint} &&
+ (!isSwap($_) || $::expert) &&
+ (!isFat($_) || $_->{notFormatted} || $::expert) &&
+ (!isOtherAvailableFS($_) || $::expert || $_->{toFormat})
} @$fstab;
$_->{toFormat} = 1 foreach grep { isSwap($_) && !$::expert } @$fstab;