[25692] in Source-Commits
/svn/athena r25174 - trunk/debathena/config/apparmor-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue Jun 28 17:31:10 2011
Date: Tue, 28 Jun 2011 17:30:27 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106282130.p5SLURhx023666@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-28 17:30:27 -0400 (Tue, 28 Jun 2011)
New Revision: 25174
Modified:
trunk/debathena/config/apparmor-config/debian/changelog
trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst
Log:
In apparmor-config:
* ensure local/usr.sbin/cupsd and local/usr.sbin.ntpd files exist even
if those packages aren't installed (Trac: #737)
Modified: trunk/debathena/config/apparmor-config/debian/changelog
===================================================================
--- trunk/debathena/config/apparmor-config/debian/changelog 2011-06-27 19:18:51 UTC (rev 25173)
+++ trunk/debathena/config/apparmor-config/debian/changelog 2011-06-28 21:30:27 UTC (rev 25174)
@@ -1,3 +1,10 @@
+debathena-apparmor-config (1.2.1) unstable; urgency=low
+
+ * ensure local/usr.sbin/cupsd and local/usr.sbin.ntpd files exist even
+ if those packages aren't installed (Trac: #737)
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 28 Jun 2011 17:27:26 -0400
+
debathena-apparmor-config (1.2) unstable; urgency=low
* Transform <abstractions/nameservice> to allow reading
Modified: trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst
===================================================================
--- trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst 2011-06-27 19:18:51 UTC (rev 25173)
+++ trunk/debathena/config/apparmor-config/debian/debathena-apparmor-config.postinst 2011-06-28 21:30:27 UTC (rev 25174)
@@ -84,6 +84,11 @@
cleanup_old_diversion /etc/apparmor.d/tunables/home
fi
+ # Ensure local files exist
+ for f in usr.sbin.cupsd usr.sbin.ntpd; do
+ [ -f "/etc/apparmor.d/local/$f" ] || touch "/etc/apparmor.d/local/$f"
+ done
+
if hash apparmor_status 2>/dev/null && apparmor_status --enabled; then
if hash invoke-rc.d 2>/dev/null; then
invoke-rc.d apparmor reload
