diff --git a/debian/alternc.config b/debian/alternc.config index baffe565..0693198f 100644 --- a/debian/alternc.config +++ b/debian/alternc.config @@ -180,17 +180,20 @@ db_get alternc/alternc_location LOCATION="$RET" #checking acl and quota activation, does't work with NFS yet. should now work with lxc MOUNT_POINT=$(df -P ${LOCATION%/*} | tail -n 1 | awk '{print $6}') + # Get the mount options for the path:$ MOUNT_OPTS=$(awk '$2=="'$MOUNT_POINT'" { print $4 }' /proc/mounts) -# Check to see if acl is one of the mount points:$ -echo $MOUNT_OPTS | tr , \\\n | grep -q '^acl$' -if [ $(echo $MOUNT_OPTS | tr , \\\n | grep '^acl$' 2>/dev/null) != 'acl' ]; then +# Check to see if acl is one of the mount points:$ +ACL="$(echo "$MOUNT_OPTS" | tr "," "\\n" | grep '^acl$')" || true + +if [ -z "$ACL" ]; then db_input critical alternc/acluninstalled || true db_go -# db_reset alternc/acluninstalled || true -# db_fset alternc/acluninstalled "seen" "false" || true -# exit 1 + db_title AlternC + db_reset alternc/acluninstalled || true + db_fset alternc/acluninstalled "seen" "false" || true + exit 1 fi quota_activation=$(quotaon -pa 2>/dev/null |grep '^group.*on$' | /usr/bin/awk '$4 ~ /^\'$MOUNT_POINT'$/ {print $4}')