diff options
Diffstat (limited to 'perl-install/fs/mount_options.pm')
| -rw-r--r-- | perl-install/fs/mount_options.pm | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 58c2b3d1b..8b8cc0bff 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 250965 2009-01-08 08:17:26Z pixel $ +package fs::mount_options; # $Id: mount_options.pm 268841 2010-05-17 06:52:12Z pterjan $ 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', + user_xattr => 'nouser_xattr', acl => 'noacl', ); my @user_implies = qw(noexec nodev nosuid); \%non_defaults, \@user_implies; @@ -32,10 +32,9 @@ sub unpack { nfs => [ qw(rsize=8192 wsize=8192) ], cifs => [ qw(username= password=) ], davfs2 => [ qw(username= password= uid= gid=) ], - ext4dev => [ qw(extents) ], reiserfs => [ 'notail' ], ); - push @{$per_fs{$_}}, 'usrquota', 'grpquota' foreach 'ext2', 'ext3', 'ext4dev', 'xfs'; + push @{$per_fs{$_}}, 'usrquota', 'grpquota' foreach 'ext2', 'ext3', 'ext4', 'xfs'; while (my ($fs, $l) = each %per_fs) { $part->{fs_type} eq $fs || $part->{fs_type} eq 'auto' && member($fs, @auto_fs) or next; @@ -43,7 +42,6 @@ sub unpack { } $non_defaults->{relatime} = 1 if isTrueLocalFS($part) || $part->{fs_type} eq 'ntfs-3g'; - $non_defaults->{encrypted} = 1; my $defaults = { reverse %$non_defaults }; my %options = map { $_ => '' } keys %$non_defaults; @@ -111,8 +109,7 @@ sub pack { # update me on each util-linux new release: sub help() { ( - - 'encrypted' => N("Use an encrypted file system"), + 'acl' => N("Enable Posix Access Control Lists"), 'flush' => N("Flush write cache on file close"), @@ -226,16 +223,13 @@ sub set_default { }) if $part->{is_removable}; put_in_hash($options, { - 'umask=0' => $opts{security} <= 3, + 'umask=0' => $opts{security} <= 1, 'iocharset=' => $opts{iocharset}, 'codepage=' => $opts{codepage}, }); } - if ($part->{fs_type} eq 'ext4dev') { - put_in_hash($options, { extents => 1 }); - } if ($part->{fs_type} eq 'ntfs') { put_in_hash($options, { ro => 1, 'nls=' => $opts{iocharset}, - 'umask=0' => $opts{security} < 3, 'umask=0022' => $opts{security} < 4, + 'umask=0' => $opts{security} < 1, 'umask=0022' => $opts{security} < 2, }); } if (fs::type::can_be_this_fs_type($part, 'iso9660')) { @@ -245,10 +239,8 @@ sub set_default { $options->{notail} = 1; $options->{user_xattr} = 1; } - if ($part->{fs_type} eq 'ext3') { - $options->{user_xattr} = 1; - put_in_hash($options, { acl => 1 }) ; - + if (member($part->{fs_type}, qw(ext2 ext3 ext4))) { + $options->{acl} = 1; } if (isLoopback($part) && !isSwap($part)) { #- no need for loop option for swap files $options->{loop} = 1; |