[25712] in Source-Commits
/svn/athena r25186 - trunk/debathena/config/apparmor-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 29 13:46:03 2011
Date: Wed, 29 Jun 2011 13:45:57 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106291745.p5THjvDQ004598@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-29 13:45:57 -0400 (Wed, 29 Jun 2011)
New Revision: 25186
Modified:
trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst
Log:
Deal with local profiles if applicable
Modified: trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst
===================================================================
--- trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst 2011-06-29 16:27:30 UTC (rev 25185)
+++ trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst 2011-06-29 17:45:57 UTC (rev 25186)
@@ -85,7 +85,8 @@
fi
# Ensure local files exist
- if [ -x /usr/bin/dh_apparmor ]; then
+ # This should be replaced with something less stupid
+ if fgrep -q '#include <local/' /etc/apparmor.d/*.debathena; then
mkdir -p /etc/apparmor.d/local
for f in usr.sbin.cupsd usr.sbin.ntpd; do
[ -f "/etc/apparmor.d/local/$f" ] || touch "/etc/apparmor.d/local/$f"
