diff options
Diffstat (limited to 'perl-install/fs/mount_options.pm')
| -rw-r--r-- | perl-install/fs/mount_options.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index bae101679..0b63f7260 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -1,4 +1,4 @@ -package fs::mount_options; # $Id: mount_options.pm 268841 2010-05-17 06:52:12Z pterjan $ +package fs::mount_options; use diagnostics; use strict; @@ -12,7 +12,7 @@ sub list() { my %non_defaults = ( sync => 'async', noatime => 'atime', noauto => 'auto', ro => 'rw', user => 'nouser', nodev => 'dev', noexec => 'exec', nosuid => 'suid', - user_xattr => 'nouser_xattr', acl => 'noacl', + user_xattr => 'nouser_xattr', ); my @user_implies = qw(noexec nodev nosuid); \%non_defaults, \@user_implies; @@ -35,9 +35,10 @@ sub unpack { reiserfs => [ 'notail' ], ); push @{$per_fs{$_}}, 'usrquota', 'grpquota' foreach 'ext2', 'ext3', 'ext4', 'xfs'; + push @{$per_fs{$_}}, 'acl' foreach 'ext2', 'ext3', 'ext4', 'reiserfs'; while (my ($fs, $l) = each %per_fs) { - $part->{fs_type} eq $fs || $part->{fs_type} eq 'auto' && member($fs, @auto_fs) or next; + member($part->{fs_type}, $fs, 'auto') && member($fs, @auto_fs) or next; $non_defaults->{$_} = 1 foreach @$l; } @@ -186,7 +187,6 @@ sub set_default { if (!$opts{ignore_is_removable} && $part->{is_removable} && !member($part->{mntpoint}, fs::type::directories_needed_to_boot()) && (!$part->{fs_type} || $part->{fs_type} eq 'auto' || $part->{fs_type} =~ /:/)) { - $options->{supermount} = 0; #- always disable supermount $part->{fs_type} = 'auto'; $options->{flush} = 1 if $part->{media_type} ne 'cdrom'; } @@ -207,7 +207,7 @@ sub set_default { #- filesystem (e.g, for faster access on the #- news spool to speed up news servers). $options->{relatime} = $options->{noatime} = 0; - $options->{detect_devices::isLaptop() ? 'noatime': 'relatime'} = 1 if !$opts{force_atime}; + $options->{ detect_devices::isLaptop() ? 'noatime' : 'relatime' } = 1 if !$opts{force_atime}; } if ($part->{fs_type} eq 'nfs') { put_in_hash($options, { @@ -224,7 +224,7 @@ sub set_default { }) if $part->{is_removable}; put_in_hash($options, { - 'umask=0' => $opts{security} <= 1, + 'umask=0' => $opts{security} <= 1 && !isESP($part), 'iocharset=' => $opts{iocharset}, 'codepage=' => $opts{codepage}, }); } |