From c4f5b70cc7c311d08f7b152571ebac44eb3166ed Mon Sep 17 00:00:00 2001
From: Alan Garcia <a.garcia@nnx.com>
Date: Sun, 3 Mar 2013 11:57:57 +0000
Subject: [PATCH] =?UTF-8?q?Manquait=20un=20morceau=20de=20m=C3=A9nage=20su?=
 =?UTF-8?q?r=20le=20fichier=20de=20tests=20des=20ACLs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/alternc.config   | 2 ++
 install/alternc.install | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/alternc.config b/debian/alternc.config
index 0003d4ec..de2d86da 100644
--- a/debian/alternc.config
+++ b/debian/alternc.config
@@ -218,12 +218,14 @@ while [ "$QUEST_STATE" != 0 -a "$QUEST_STATE" != 13 ]; do
     setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null
 
     if [ $? -ne 0 ]; then
+      test -e "$aclcheckfile" && rm -f "$aclcheckfile" || true
       db_input critical alternc/acluninstalled || true
       db_go
       db_reset alternc/acluninstalled || true
       db_fset alternc/acluninstalled "seen" "false" || true
       exit 2
     fi
+    test -e "$aclcheckfile" && rm -f "$aclcheckfile" || true
 
     quota -gA -f $MOUNT_POINT 2>/dev/null
 
diff --git a/install/alternc.install b/install/alternc.install
index d14cd047..efb04afc 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -141,7 +141,8 @@ done
 # Check ACL
 aclcheckfile="$ALTERNC_HTML/test-acl"
 touch "$aclcheckfile"
-setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; exit 2)
+setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; test -e "$aclcheckfile" && rm -f "$aclcheckfile" ; exit 2)
+test -e "$aclcheckfile" && rm -f "$aclcheckfile"
 
 # XXX: copy-paste from debian/config
 if [ -r /etc/alternc/my.cnf ]; then