From 3de91dde3afb65a42d38f63bf7d75cac546034aa Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@alternc.org>
Date: Mon, 20 Aug 2012 20:29:57 +0000
Subject: [PATCH] to be able to install an alternc instance on a LXC, I need to
 fix the quotaon call + skip the acl test...

---
 debian/alternc.config | 10 +++++-----
 debian/templates      |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/alternc.config b/debian/alternc.config
index c72674a1..c303042c 100644
--- a/debian/alternc.config
+++ b/debian/alternc.config
@@ -75,19 +75,19 @@ db_set alternc/alternc_location "$ALTERNC_LOC"
 fi
 
 db_get alternc/alternc_location
-#checking acl and quota activation, does't work with NFS yet.
+#checking acl and quota activation, does't work with NFS yet. and with LXC too...
 location=$RET
 mount_point=`df -P $location | tail -1 | /usr/bin/awk '{print $NF}'`
-quota_activation=`quotaon -pa |grep '^group.*on$' | /usr/bin/awk '$4 ~ /^\'$mount_point'$/ {print $4}'`
+quota_activation=`(quotaon -pa 2>/dev/null || true) |grep '^group.*on$' | /usr/bin/awk '$4 ~ /^\'$mount_point'$/ {print $4}'`
 acl_activation=`/bin/mount | awk '$NF ~ /acl/ && $NF !~ /noacl/ && $3 ~ /^\'"$mount_point"'$/ {print $3}'`
 
 if [ "$mount_point" != "$acl_activation" ]                                                           
 then                                           
 	db_input critical alternc/acluninstalled || true
 	db_go
-    db_reset alternc/acluninstalled || true
-    db_fset alternc/acluninstalled "seen" "false" || true
-	exit 1
+#    db_reset alternc/acluninstalled || true
+#    db_fset alternc/acluninstalled "seen" "false" || true
+#    exit 1
 fi           
 
 if [ "$mount_point" != "$quota_activation" ]
diff --git a/debian/templates b/debian/templates
index f32d5fe5..7991652d 100644
--- a/debian/templates
+++ b/debian/templates
@@ -15,7 +15,8 @@ Template: alternc/warningaclquota
 Type: note
 _Description: AlternC need ACL and QUOTA activated
  AlternC can't work without ACL activated on his file.
- Please check your /etc/fstab to activate ACL for AlternC.
+ Please check your /etc/fstab and add "acl" to the options
+ of the partition where you will install AlternC.
  .
  Run /usr/lib/alternc/fixperms.sh once it's activated.
  .