Merge lp:~julian-edwards/maas/packaging-trusty-fix-apparmor-for-dhcp into lp:~maas-maintainers/maas/packaging.trusty

[Julian Edwards]

debian/maas-dhcp.apparmor: Add a workaround so that the dhcpd server can rotate its leases file.

The fix is already in the trunk packaging, it was never backported.

[Jeroen T. Vermeulen (jtv)]

Thanks for doing this. I originally added the workaround. At the time it seemed sensible to expect a solution from somewhere upstream, and it wasn't quite clear to me just how much trouble the bug was causing. But now this looks like it could make a very significant difference to some users.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-25 03:09:09 +0000
+++ debian/changelog	2014-09-09 04:33:43 +0000
@@ -1,8 +1,17 @@
-maas (1.6.1+bzr2550-0ubuntu2) UNRELEASED; urgency=medium
+maas (1.6.1+bzr2550-0ubuntu4) UNRELEASED; urgency=medium
 
   * UNRELEASED 
-
- -- Julian Edwards <[e-mail]>  Mon, 25 Aug 2014 13:07:58 +1000
+  * 
+
+ -- Julian Edwards <[e-mail]>  Tue, 09 Sep 2014 14:30:56 +1000
+
+maas (1.6.1+bzr2550-0ubuntu2) trusty; urgency=medium
+
+  [ Julian Edwards ]
+  * debian/maas-dhcp.apparmor: Add a workaround so that the dhcpd server
+    can rotate its leases file. (LP: #1184914)
+
+ -- Julian Edwards <[e-mail]>  Tue, 09 Sep 2014 14:27:47 +1000
 
 maas (1.6.1+bzr2550-0ubuntu1) trusty; urgency=medium
 
 
=== modified file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor	2012-09-26 07:16:00 +0000
+++ debian/maas-dhcp.apparmor	2014-09-09 04:33:43 +0000
@@ -1,3 +1,7 @@
+# Work around bug:
+# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
+capability dac_override,
+
 /run/maas/dhcp/ r,
 /run/maas/dhcp/** r,
 /run/maas/dhcp/*.pid lrw,