From 78b533dcec34cb48a40bc9be7d01a16f91b4fa09 Mon Sep 17 00:00:00 2001
From: Derek Jennings <djennings@mageia.org>
Date: Fri, 5 Jul 2013 12:36:48 +0000
Subject: fix acl enabled test (mga#9195)

---
 Makefile      | 2 +-
 NEWS          | 3 +++
 bin/drakguard | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 74b148b..c337ba1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 NAME = drakguard
-VERSION = 0.7.12
+VERSION = 0.7.13
 
 DESTDIR=
 sbindir=/usr/sbin
diff --git a/NEWS b/NEWS
index 5663099..947b127 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.7.13
+- fix acl enabled test (mga#9195)
+
 0.7.12
 - allow urpmi to work when parental controls enabled (mga#7775)
 
diff --git a/bin/drakguard b/bin/drakguard
index 5be4409..42f8e90 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -314,10 +314,10 @@ if (cat_('/boot/config') =~ /_FS_POSIX_ACL=y/ &&  grep { $_ && !/acl/ && !/^#/ &
 }
 else {
     my @mount = `mount`;
-    if (grep { /,acl/ } @mount) {
-        $acl_active = 1;
+    if (grep { !/,acl/ && m/ext[23]|reiserfs/ } @mount) {
+        $in->ask_warn(N("Warning"), N("The support for Access Control Lists, required by the Block programs feature, is enabled, but not yet activated.") . N("It is necessary to restart your computer to activate it."), $acl_active = 0);
     } else {
-        $in->ask_warn(N("Warning"), N("The support for Access Control Lists, required by the Block programs feature, is enabled, but not yet activated.") . N("It is necessary to restart your computer to activate it."), $acl_active = 0) }
+        $acl_active = 1 }
 }
 update_time_change();
 Gtk2->main;
-- 
cgit v1.2.1