Merge lp:~cameronnemo/apparmor/dnsmasq-lxc into lp:apparmor/2.12

[Cameron Norman]

Adds the paths for the LXC network setup scripts.

[lp:~cameronnemo/apparmor/dnsmasq-lxc]

2974. By Cameron Norman on 2015-03-30

usr.sbin.dnsmasq: add lxc-net paths

[Seth Arnold (seth-arnold)]

On Mon, Mar 30, 2015 at 12:14:23AM -0000, Cameron Norman wrote:
> Cameron Norman has proposed merging lp:~cameronnemo/apparmor/dnsmasq-lxc into lp:apparmor.
>
> Requested reviews:
> AppArmor Developers (apparmor-dev)
>
> For more details, see:
> https://code.launchpad.net/~cameronnemo/apparmor/dnsmasq-lxc/+merge/254523

Funny, the merge request looks good on the website, but the inlined diff
on the mail list looks like it includes merge conflict resolution hints:
https://lists.ubuntu.com/archives/apparmor/2015-March/007595.html

Any ideas what went wrong where?

Thanks

> Adds the paths for the LXC network setup scripts.
> --
> Your team AppArmor Developers is requested to review the proposed merge of lp:~cameronnemo/apparmor/dnsmasq-lxc into lp:apparmor.

> === modified file 'profiles/apparmor.d/usr.sbin.dnsmasq'
> --- profiles/apparmor.d/usr.sbin.dnsmasq 2014-12-22 16:56:37 +0000
> +++ profiles/apparmor.d/usr.sbin.dnsmasq 2015-03-30 00:13:50 +0000
> @@ -65,10 +65,17 @@
> /{,var/}run/libvirt/network/ r,
> /{,var/}run/libvirt/network/*.pid rw,
>
> +<<<<<<< TREE
> # libvirt lease helper
> /usr/lib{,64}/libvirt/libvirt_leaseshelper ix,
> /{,var/}run/leaseshelper.pid rwk,
>
> +=======
> + # lxc-net pid and lease files
> + /{,var/}run/lxc/dnsmasq.pid rw,
> + /var/lib/misc/dnsmasq.*.leases rw,
> +
> +>>>>>>> MERGE-SOURCE
> # NetworkManager integration
> /{,var/}run/nm-dns-dnsmasq.conf r,
> /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,

[Cameron Norman (cameronnemo)]

Yeah it seems that the first version had merge conflicts. I pushed to the repo with the overwrite flag and fixed that after I saw it. No idea what the original problem was... I just grabbed a new branch.

[Steve Beattie (sbeattie)]

Thanks, merged your updated branch to trunk and the 2.9 branch.

review: Approve

=== modified file 'profiles/apparmor.d/usr.sbin.dnsmasq'
--- profiles/apparmor.d/usr.sbin.dnsmasq	2014-12-22 16:56:37 +0000
+++ profiles/apparmor.d/usr.sbin.dnsmasq	2015-03-30 03:50:01 +0000
@@ -69,6 +69,10 @@
   /usr/lib{,64}/libvirt/libvirt_leaseshelper ix,
   /{,var/}run/leaseshelper.pid rwk,
 
+  # lxc-net pid and lease files
+  /{,var/}run/lxc/dnsmasq.pid    rw,
+  /var/lib/misc/dnsmasq.*.leases rw,
+
   # NetworkManager integration
   /{,var/}run/nm-dns-dnsmasq.conf r,
   /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w,