From 0935fb7e249568209af72cce0094feee6a11036c Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 13 Jun 2005 04:52:38 +0000
Subject: fs::auto_fs() is now fs::type::guessed_by_mount() (still not a really
 nice name...)

---
 perl-install/fs/mount_options.pm | 2 +-
 perl-install/fs/type.pm          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install/fs')

diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 358f01e01..a8fa688db 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -23,7 +23,7 @@ sub unpack {
 
     my ($non_defaults, $user_implies) = list();
 
-    my @auto_fs = fs::auto_fs();
+    my @auto_fs = fs::type::guessed_by_mount();
     my %per_fs = (
 		  iso9660 => [ qw(unhide) ],
 		  vfat => [ qw(umask=0 umask=0022) ],
diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm
index 1c72f6160..95ece71fa 100644
--- a/perl-install/fs/type.pm
+++ b/perl-install/fs/type.pm
@@ -372,6 +372,10 @@ sub check {
     $fs_type eq "reiserfs" && $part->{size} < 32 << 11 and die N("You can not use ReiserFS for partitions smaller than 32MB");
 }
 
+sub guessed_by_mount() {
+    grep { $_ && !/nodev/ } chomp_(cat_('/etc/filesystems'));
+}
+
 sub directories_needed_to_boot() { 
     qw(/ /usr /var /boot /tmp);
 }
-- 
cgit v1.2.1