summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDerek Jennings <djennings@mageia.org>2013-07-05 12:36:48 +0000
committerColin Guthrie <colin@mageia.org>2013-08-24 18:29:43 +0100
commit78b533dcec34cb48a40bc9be7d01a16f91b4fa09 (patch)
tree08c2f147baa8ed6e4e0c06fb664dba3bafabcadd /bin
parentffd70ae28ee3fe1d875ffcf79fae872d85e99a0d (diff)
downloaddrakguard-78b533dcec34cb48a40bc9be7d01a16f91b4fa09.tar
drakguard-78b533dcec34cb48a40bc9be7d01a16f91b4fa09.tar.gz
drakguard-78b533dcec34cb48a40bc9be7d01a16f91b4fa09.tar.bz2
drakguard-78b533dcec34cb48a40bc9be7d01a16f91b4fa09.tar.xz
drakguard-78b533dcec34cb48a40bc9be7d01a16f91b4fa09.zip
fix acl enabled test (mga#9195)
Diffstat (limited to 'bin')
-rwxr-xr-xbin/drakguard6
1 files changed, 3 insertions, 3 deletions
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;