[25713] in Source-Commits
Re: /svn/athena r25186 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Wed Jun 29 13:47:24 2011
Date: Wed, 29 Jun 2011 13:47:16 -0400 (EDT)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Jonathan D Reed <jdreed@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201106291745.p5THjvDQ004598@drugstore.mit.edu>
Message-ID: <alpine.DEB.2.00.1106291346450.4844@tyger.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
That seems likely to work; ACK. If you build and upload now I can test on
Lucid -cluster.
--
Geoffrey Thomas
geofft@mit.edu
On Wed, 29 Jun 2011, Jonathan D Reed wrote:
> 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"
>
>
