summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-15 18:43:25 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-15 18:43:25 +0000
commit329d7c684af940795efbc655a6dc6b3e227cbbb0 (patch)
tree1c1b5e19d4fcc2c5e69435398e1a550c2ba88178
parentc33a9d19c58d15ca8f29ed46d7be96b81b89ae1b (diff)
downloaddrakguard-329d7c684af940795efbc655a6dc6b3e227cbbb0.tar
drakguard-329d7c684af940795efbc655a6dc6b3e227cbbb0.tar.gz
drakguard-329d7c684af940795efbc655a6dc6b3e227cbbb0.tar.bz2
drakguard-329d7c684af940795efbc655a6dc6b3e227cbbb0.tar.xz
drakguard-329d7c684af940795efbc655a6dc6b3e227cbbb0.zip
handle kernel having *_FS_POSIX_ACL=y (mga#9195)
-rw-r--r--NEWS2
-rwxr-xr-xbin/drakguard2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 69256e6..aa44945 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- ignore comments in /etc/fstab (mga#9195)
+
0.7.8:
- Clean for mageia
- Add new icons
diff --git a/bin/drakguard b/bin/drakguard
index f64a9b2..b4f9a2a 100755
--- a/bin/drakguard
+++ b/bin/drakguard
@@ -296,7 +296,7 @@ gtkadd($w->{window},
$w->show;
# FIXME: bogus check: if ACLs are disabled everywhere but in /unused/path, it's OK...
-if (grep { $_ && !/acl/ } chomp_(cat_($fstab_file)) && grep { $_ && !/^#/ && m/ext/ } chomp_(cat_($fstab_file))) {
+if (cat_('/boot/config') =~ /_FS_POSIX_ACL=y/ || grep { $_ && !/acl/ } chomp_(cat_($fstab_file)) && grep { $_ && !/^#/ && m/ext/ } 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) {