From 7f742ed445eb8dd9da4a02ea281feb246d946210 Mon Sep 17 00:00:00 2001 From: Derek Jennings Date: Sun, 30 Jun 2013 22:15:12 +0000 Subject: allow for ext4 when enabling acl (mga#9195) --- Makefile | 2 +- NEWS | 3 +++ bin/drakguard | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 56bde39..fe99115 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = drakguard -VERSION = 0.7.10 +VERSION = 0.7.11 DESTDIR= sbindir=/usr/sbin diff --git a/NEWS b/NEWS index fd2bc15..bc5d50d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +0.7.11 +- allow for ext4 when enabling acl (mga#9195) + 0.7,10 - Use --kerneltz option to select local time zone (mga#6400) 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; -- cgit v1.2.1