Merge lp:~sdeziel/apparmor/dnsmasq-lxd-bridge into lp:apparmor/2.12

Proposed by Simon Déziel on 2016-04-08
Status: Merged
Merged at revision: 3435
Proposed branch: lp:~sdeziel/apparmor/dnsmasq-lxd-bridge
Merge into: lp:apparmor/2.12
Diff against target: 14 lines (+4/-0)
1 file modified
profiles/apparmor.d/usr.sbin.dnsmasq (+4/-0)
To merge this branch: bzr merge lp:~sdeziel/apparmor/dnsmasq-lxd-bridge
Reviewer Review Type Date Requested Status
Christian Boltz 2016-04-08 Approve on 2016-04-08
Review via email: mp+291415@code.launchpad.net
To post a comment you must log in.
Christian Boltz (cboltz) wrote :

Fixes https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/1566944

Thanks for the patch!

Merged into bzr trunk r3435.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'profiles/apparmor.d/usr.sbin.dnsmasq'
2--- profiles/apparmor.d/usr.sbin.dnsmasq 2015-12-30 21:23:42 +0000
3+++ profiles/apparmor.d/usr.sbin.dnsmasq 2016-04-08 20:30:54 +0000
4@@ -74,6 +74,10 @@
5 /{,var/}run/lxc/dnsmasq.pid rw,
6 /var/lib/misc/dnsmasq.*.leases rw,
7
8+ # lxd-bridge pid and lease files
9+ /{,var/}run/lxd-bridge/dnsmasq.pid rw,
10+ /var/lib/lxd-bridge/dnsmasq.*.leases rw,
11+
12 # NetworkManager integration
13 /{,var/}run/nm-dns-dnsmasq.conf r,
14 /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,

Subscribers

People subscribed via source and target branches