summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-02-13 14:00:18 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-02-13 14:00:18 +0000
commit6295db2384dcf742eee50df7371bbdda29656d02 (patch)
treedd8f14aa81d479fc8711e12e056fdd204ae72bbf /perl-install
parentcb57100088e9f741c80d7eca8caa377af79460dd (diff)
downloaddrakx-6295db2384dcf742eee50df7371bbdda29656d02.tar
drakx-6295db2384dcf742eee50df7371bbdda29656d02.tar.gz
drakx-6295db2384dcf742eee50df7371bbdda29656d02.tar.bz2
drakx-6295db2384dcf742eee50df7371bbdda29656d02.tar.xz
drakx-6295db2384dcf742eee50df7371bbdda29656d02.zip
revert unwanted part of partital commit
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fs.pm5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 07a23408a..d95890cb3 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -232,10 +232,7 @@ sub prepare_write_fstab {
my ($freq, $passno) =
exists $_->{freq} ?
($_->{freq}, $_->{passno}) :
- isTrueLocalFS($_) && !$_->{dmcrypt_name}
- && $_->{options} !~ /encryption=/
- && $_->{options} !~ /noauto/
- && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ?
+ isTrueLocalFS($_) && !$_->{dmcrypt_name} && $_->{options} !~ /encryption=/ && (!$_->{is_removable} || member($_->{mntpoint}, fs::type::directories_needed_to_boot())) ?
(1, $_->{mntpoint} eq '/' ? 1 : fs::type::carry_root_loopback($_) ? 0 : 2) :
(0, 0);