From 613fcd7af22bfec6c5580528079523d8aac9113b Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mandriva.org>
Date: Thu, 13 May 2010 14:36:01 +0000
Subject: - enable acl by default on ext3/4 fs - enable user_xattr on home for
 ext2 too

---
 perl-install/NEWS         |  3 +++
 perl-install/fs/format.pm | 12 ++++++++----
 perl-install/install/NEWS |  3 +++
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2709b9df0..cca0cf9c8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- enable acl by default on ext3/4 fs
+- enable user_xattr on home for ext2 too
+
 Version 13.25 - 11 May 2010
 
 - bugfix for draklive-install: use "short" locale name when matching
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index 9caa4f45f..3c1c9d346 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -271,10 +271,14 @@ sub formatMount_part {
     }
 
     #- setting user_xattr on /home (or "/" if no /home)
-    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}));
+    #- 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}));
     }
 
     fs::mount::part($part, 0, $wait_message);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4f442afca..0e86183b5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- enable acl by default on ext3/4 fs
+- enable user_xattr on home for ext2 too
+
 Version 13.24 -  9 May 2010
 
 - include btrfs and crc32c modules in install (#59068)
-- 
cgit v1.2.1