summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-04-07 10:03:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-04-07 10:03:36 +0000
commitc1219e637b5b9d31351a43e712353b89e0433c3a (patch)
treec8fd9d75ea4c9867dc2c9932bcc36c9b61e9f7b1
parentd0f8bce876c02231cc45e6dc05dfefe6475db7ff (diff)
downloaddrakx-c1219e637b5b9d31351a43e712353b89e0433c3a.tar
drakx-c1219e637b5b9d31351a43e712353b89e0433c3a.tar.gz
drakx-c1219e637b5b9d31351a43e712353b89e0433c3a.tar.bz2
drakx-c1219e637b5b9d31351a43e712353b89e0433c3a.tar.xz
drakx-c1219e637b5b9d31351a43e712353b89e0433c3a.zip
workaround weird old code (bugzilla #15300)
-rw-r--r--perl-install/install_steps.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 691126773..06ace7895 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -241,13 +241,13 @@ sub ask_mntpoint_s {#-}}}
my %m; foreach (@$fstab) {
my $m = $_->{mntpoint};
- next if !$m || $m eq 'swap'; #- there may be a lot of swap.
+ $m && $m =~ m!^/! or next; #- there may be a lot of swaps or "none"
$m{$m} and die N("Duplicate mount point %s", $m);
$m{$m} = 1;
#- in case the type does not correspond, force it to ext3
- fs::type::set_fs_type($_, 'ext3') if $m =~ m|^/| && !isTrueFS($_) && !isOtherAvailableFS($_);
+ fs::type::set_fs_type($_, 'ext3') if !isTrueFS($_) && !isOtherAvailableFS($_);
}
1;
}