summaryrefslogtreecommitdiffstats
path: root/perl-install/fs/format.pm
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-05-13 17:15:26 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-05-13 17:15:26 +0000
commitae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee (patch)
tree9354ed86565c0937d921a84bbe8f2b4251c0c9ad /perl-install/fs/format.pm
parentc6ef10bb0b4734cefbe3cf0eb337ada066b1602a (diff)
downloaddrakx-ae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee.tar
drakx-ae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee.tar.gz
drakx-ae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee.tar.bz2
drakx-ae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee.tar.xz
drakx-ae0d8fbfc6f2c3b5659c82e7a5be6eb7de4c82ee.zip
enable acl in fstab not on the fs as we currently do not handle options on the fs in an unified way and have no way to check if they are set in the apps
Diffstat (limited to 'perl-install/fs/format.pm')
-rw-r--r--perl-install/fs/format.pm12
1 files changed, 4 insertions, 8 deletions
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);