On Thu, Jan 14, 2016 at 03:54:29PM +0000, Richard W.M. Jones wrote: > > FYI I'm testing the attached patch (written by Jiri Denemark). The > tests usually take a day to run. Yes this patch appears to fix all the problems. Can it be applied to libvirt? Rich. > diff --git i/src/security/security_dac.c w/src/security/security_dac.c > index 80709fe..378b922 100644 > --- i/src/security/security_dac.c > +++ w/src/security/security_dac.c > @@ -1128,14 +1128,6 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr mgr, > virSecurityDACRestoreFileLabel(priv, def->os.loader->nvram) < 0) > rc = -1; > > - if (def->os.kernel && > - virSecurityDACRestoreFileLabel(priv, def->os.kernel) < 0) > - rc = -1; > - > - if (def->os.initrd && > - virSecurityDACRestoreFileLabel(priv, def->os.initrd) < 0) > - rc = -1; > - > if (def->os.dtb && > virSecurityDACRestoreFileLabel(priv, def->os.dtb) < 0) > rc = -1; > diff --git i/src/security/security_selinux.c w/src/security/security_selinux.c > index 721c451..475cdbc 100644 > --- i/src/security/security_selinux.c > +++ w/src/security/security_selinux.c > @@ -2034,14 +2034,6 @@ virSecuritySELinuxRestoreAllLabel(virSecurityManagerPtr mgr, > virSecuritySELinuxRestoreFileLabel(mgr, def->os.loader->nvram) < 0) > rc = -1; > > - if (def->os.kernel && > - virSecuritySELinuxRestoreFileLabel(mgr, def->os.kernel) < 0) > - rc = -1; > - > - if (def->os.initrd && > - virSecuritySELinuxRestoreFileLabel(mgr, def->os.initrd) < 0) > - rc = -1; > - > if (def->os.dtb && > virSecuritySELinuxRestoreFileLabel(mgr, def->os.dtb) < 0) > rc = -1; > > _______________________________________________ > Libguestfs mailing list > Libguestfs@xxxxxxxxxx > https://www.redhat.com/mailman/listinfo/libguestfs -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list