[libvirt] [PATCHv2 1/2] Don't output libvirt-UUID.files for LXC apparmor profiles

2014-07-11 Thread Cédric Bosdonnat 
---
 src/security/virt-aa-helper.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index b5f66f3..c8f17f9 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1342,10 +1342,13 @@ main(int argc, char **argv)
 vah_info(include_file);
 vah_info(included_files);
 rc = 0;
+} else if (ctl-def-virtType == VIR_DOMAIN_VIRT_LXC) {
+rc = 0;
 } else if ((rc = update_include_file(include_file,
  included_files,
- ctl-append)) != 0)
+ ctl-append)) != 0) {
 goto cleanup;
+}
 
 
 /* create the profile from TEMPLATE */
-- 
1.8.4.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCHv2 1/2] Don't output libvirt-UUID.files for LXC apparmor profiles

2014-07-11 Thread Eric Blake 
On 07/11/2014 07:01 AM, Cédric Bosdonnat wrote:
 ---
  src/security/virt-aa-helper.c | 5 -
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
 index b5f66f3..c8f17f9 100644
 --- a/src/security/virt-aa-helper.c
 +++ b/src/security/virt-aa-helper.c
 @@ -1342,10 +1342,13 @@ main(int argc, char **argv)
  vah_info(include_file);
  vah_info(included_files);
  rc = 0;
 +} else if (ctl-def-virtType == VIR_DOMAIN_VIRT_LXC) {
 +rc = 0;
  } else if ((rc = update_include_file(include_file,
   included_files,
 - ctl-append)) != 0)
 + ctl-append)) != 0) {
  goto cleanup;
 +}

I squashed this on top of a revert of v1, since I had pushed that before
realizing you had posted a v2, and pushed the result.

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list