summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-27 12:08:44 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-27 12:08:44 +0000
commit0f2b305002af0e6212f693ba0230392c47bc4ac5 (patch)
treeac76fe73fb749d25761045600ed19463a32a5e0f
parentb16899b79fb6d21aee952d0034c00838ada6a378 (diff)
downloaddrakx-0f2b305002af0e6212f693ba0230392c47bc4ac5.tar
drakx-0f2b305002af0e6212f693ba0230392c47bc4ac5.tar.gz
drakx-0f2b305002af0e6212f693ba0230392c47bc4ac5.tar.bz2
drakx-0f2b305002af0e6212f693ba0230392c47bc4ac5.tar.xz
drakx-0f2b305002af0e6212f693ba0230392c47bc4ac5.zip
only allow 'acl' option for extX & reiserfs (mga#9884)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/fs/mount_options.pm3
-rw-r--r--perl-install/install/NEWS2
3 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d1ddfe5f1..51af78a63 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o only allow 'acl' option for extX & reiserfs (mga#9884)
+
Version 15.44 - 23 april 2013
- diskdrake:
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm
index 29c09ae79..38b8077fe 100644
--- a/perl-install/fs/mount_options.pm
+++ b/perl-install/fs/mount_options.pm
@@ -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,6 +35,7 @@ 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;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index e5ea72bf0..18c85f55a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,7 @@
- fix doble logging of 'filesystem' installation (mga#7758)
- install shorewall-ipv6 along shorewall (mga#9401)
+- partionning:
+ o only allow 'acl' option for extX & reiserfs (mga#9884)
Version 15.44 - 23 april 2013