summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/diskdrake/removable.pm2
-rw-r--r--perl-install/fs.pm4
-rw-r--r--perl-install/fs/mount_options.pm2
-rw-r--r--perl-install/fs/type.pm4
4 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/diskdrake/removable.pm b/perl-install/diskdrake/removable.pm
index 14eb26772..a38671848 100644
--- a/perl-install/diskdrake/removable.pm
+++ b/perl-install/diskdrake/removable.pm
@@ -41,7 +41,7 @@ sub mount_point {
}
sub type {
my ($in, $raw_hd) = @_;
- my @fs = ('auto', fs::auto_fs());
+ my @fs = ('auto', fs::type::guessed_by_mount());
my $fs_type = $raw_hd->{fs_type};
$in->ask_from(N("Change type"),
N("Which filesystem do you want?"),
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 7b2ea6c51..766a2e702 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -387,10 +387,6 @@ sub write_fstab {
network::smb::save_credentials($_) foreach @$smb_credentials;
}
-sub auto_fs() {
- grep { chop; $_ && !/nodev/ } cat_("/etc/filesystems");
-}
-
sub set_removable_mntpoints {
my ($all_hds) = @_;
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);
}