diff options
| author | Derek Jennings <djennings@mageia.org> | 2013-06-30 22:15:12 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-08-24 18:29:42 +0100 |
| commit | 7f742ed445eb8dd9da4a02ea281feb246d946210 (patch) | |
| tree | 5659ba3b78a334f58f6c4862631360e6b277ff90 /bin | |
| parent | bf3bdbf09eb763a62f7cf8d736d175d555f6e188 (diff) | |
| download | drakguard-7f742ed445eb8dd9da4a02ea281feb246d946210.tar drakguard-7f742ed445eb8dd9da4a02ea281feb246d946210.tar.gz drakguard-7f742ed445eb8dd9da4a02ea281feb246d946210.tar.bz2 drakguard-7f742ed445eb8dd9da4a02ea281feb246d946210.tar.xz drakguard-7f742ed445eb8dd9da4a02ea281feb246d946210.zip | |
allow for ext4 when enabling acl (mga#9195)
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/drakguard | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/drakguard b/bin/drakguard index f1d3776..bb6cc75 100755 --- a/bin/drakguard +++ b/bin/drakguard @@ -296,11 +296,11 @@ gtkadd($w->{window}, $w->show; # FIXME: bogus check: if ACLs are disabled everywhere but in /unused/path, it's OK... -if (cat_('/boot/config') =~ /_FS_POSIX_ACL=y/ || grep { $_ && !/acl/ } chomp_(cat_($fstab_file)) && grep { $_ && !/^#/ && m/ext/ } chomp_(cat_($fstab_file))) { +if (cat_('/boot/config') =~ /_FS_POSIX_ACL=y/ && grep { $_ && !/acl/ && !/^#/ && m/ext[23]|reiserfs/ } chomp_(cat_($fstab_file))) { $acl_active = 1; $in->ask_yesorno(N("Warning"), N("The support for Access Control Lists must be enabled in order to use the Block programs feature.\nDo you want to enable it now?", $acl_active = 1)) or $acl_active = 0; if ($acl_active) { - my @ext_lines = grep { $_ && m/ext/ } chomp_(cat_($fstab_file)); + my @ext_lines = grep { $_ && m/ext[23]|reiserfs/ && !/^#/ } chomp_(cat_($fstab_file)); foreach my $line (@ext_lines) { my ($flag) = $line =~ /^.+\s.+\s(ext(\w)\s(\w*))\s/ or next; $line =~ s/ext(\w)\s(\w*)\s/$flag,acl /g; |