From 36bd229acd27cd559836674e9bde45ab816b9d33 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Sat, 27 Apr 2013 12:08:44 +0000 Subject: only allow 'acl' option for extX & reiserfs (mga#9884) --- perl-install/NEWS | 3 +++ perl-install/fs/mount_options.pm | 3 ++- perl-install/install/NEWS | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1