diff options
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/fs/format.pm | 12 | ||||
| -rw-r--r-- | perl-install/fs/mount_options.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
4 files changed, 9 insertions, 10 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index c178ad9f6..e3fee3778 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,4 +1,4 @@ -- enable acl by default on ext3/4 fs +- enable acl by default on ext2/3/4 fs - enable user_xattr on home for ext2 too - allow setting acl option in diskdrake - default to defaultFS in LVM, not ext2 diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm index 3c1c9d346..9caa4f45f 100644 --- a/perl-install/fs/format.pm +++ b/perl-install/fs/format.pm @@ -271,14 +271,10 @@ sub formatMount_part { } #- setting user_xattr on /home (or "/" if no /home) - #- setting acl everywhere - if (!$part->{isMounted} && member($part->{fs_type}, qw(ext2 ext3 ext4))) { - my $default_options = 'acl'; - if ($part->{mntpoint} eq '/home' || - (!fs::get::has_mntpoint('/home', $all_hds) && $part->{mntpoint} eq '/')) { - $default_options .= ',user_xattr'; - } - run_program::run('tune2fs', '-o', $default_options, devices::make($part->{real_device} || $part->{device})); + if (!$part->{isMounted} && member($part->{fs_type}, qw(ext3 ext4)) + && ($part->{mntpoint} eq '/home' || + !fs::get::has_mntpoint('/home', $all_hds) && $part->{mntpoint} eq '/')) { + run_program::run('tune2fs', '-o', 'user_xattr', devices::make($part->{real_device} || $part->{device})); } fs::mount::part($part, 0, $wait_message); diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 899356daa..ee8099b93 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -239,6 +239,9 @@ sub set_default { $options->{notail} = 1; $options->{user_xattr} = 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; } diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1441b02be..e2e739a20 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,4 @@ -- enable acl by default on ext3/4 fs +- enable acl by default on ext2/3/4 fs - enable user_xattr on home for ext2 too - allow setting acl option in diskdrake - default to defaultFS in LVM, not ext2 |