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

[Simon Déziel]

[Christian Boltz (cboltz)]

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

Thanks for the patch!

Merged into bzr trunk r3435.

review: Approve

=== modified file 'profiles/apparmor.d/usr.sbin.dnsmasq'
--- profiles/apparmor.d/usr.sbin.dnsmasq	2015-12-30 21:23:42 +0000
+++ profiles/apparmor.d/usr.sbin.dnsmasq	2016-04-08 20:30:54 +0000
@@ -74,6 +74,10 @@
   /{,var/}run/lxc/dnsmasq.pid    rw,
   /var/lib/misc/dnsmasq.*.leases rw,
 
+  # lxd-bridge pid and lease files
+  /{,var/}run/lxd-bridge/dnsmasq.pid   rw,
+  /var/lib/lxd-bridge/dnsmasq.*.leases rw,
+
   # NetworkManager integration
   /{,var/}run/nm-dns-dnsmasq.conf r,
   /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,