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

Proposed by Julian Edwards on 2014-09-09
Status: Merged
Approved by: Julian Edwards on 2014-09-09
Approved revision: 295
Merged at revision: 295
Proposed branch: lp:~julian-edwards/maas/packaging-trusty-fix-apparmor-for-dhcp
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 36 lines (+16/-3)
2 files modified
debian/changelog (+12/-3)
debian/maas-dhcp.apparmor (+4/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging-trusty-fix-apparmor-for-dhcp
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) 2014-09-09 Approve on 2014-09-09
Review via email: mp+233866@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Jeroen T. Vermeulen (jtv) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-25 03:09:09 +0000
3+++ debian/changelog 2014-09-09 04:33:43 +0000
4@@ -1,8 +1,17 @@
5-maas (1.6.1+bzr2550-0ubuntu2) UNRELEASED; urgency=medium
6+maas (1.6.1+bzr2550-0ubuntu4) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9-
10- -- Julian Edwards <julian.edwards@canonical.com> Mon, 25 Aug 2014 13:07:58 +1000
11+ *
12+
13+ -- Julian Edwards <julian.edwards@canonical.com> Tue, 09 Sep 2014 14:30:56 +1000
14+
15+maas (1.6.1+bzr2550-0ubuntu2) trusty; urgency=medium
16+
17+ [ Julian Edwards ]
18+ * debian/maas-dhcp.apparmor: Add a workaround so that the dhcpd server
19+ can rotate its leases file. (LP: #1184914)
20+
21+ -- Julian Edwards <julian.edwards@canonical.com> Tue, 09 Sep 2014 14:27:47 +1000
22
23 maas (1.6.1+bzr2550-0ubuntu1) trusty; urgency=medium
24
25
26=== modified file 'debian/maas-dhcp.apparmor'
27--- debian/maas-dhcp.apparmor 2012-09-26 07:16:00 +0000
28+++ debian/maas-dhcp.apparmor 2014-09-09 04:33:43 +0000
29@@ -1,3 +1,7 @@
30+# Work around bug:
31+# https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1186662
32+capability dac_override,
33+
34 /run/maas/dhcp/ r,
35 /run/maas/dhcp/** r,
36 /run/maas/dhcp/*.pid lrw,

Subscribers

People subscribed via source and target branches

to all changes: