openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Skip labelling if no src path present 

Fixes startup of guest's with sourceless cdrom devices.

Patch from Cole Robinson originally posted here:

  https://bugzilla.redhat.com/499569

but never sent upstream.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
This commit is contained in:
Mark McLoughlin 2009-07-03 10:29:09 +00:00
parent add254feea
commit 67d0c6eb94
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Thu Jul 3 11:27:14 GMT 2009 Mark McLoughlin <markmc@redhat.com>
Patch from Cole Robinson in https://bugzilla.redhat.com/499569
* src/security_selinux.c: Skip labelling if no src path
present
Thu Jul 3 11:26:04 GMT 2009 Mark McLoughlin <markmc@redhat.com>
Patch from Tim Waugh in https://bugzilla.redhat.com/507555

3
src/security_selinux.c
View File

@ -380,6 +380,9 @@ SELinuxSetSecurityImageLabel(virConnectPtr conn,
{
const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
if (!disk->src)
return 0;
if (disk->shared) {
return SELinuxSetFilecon(conn, disk->src, default_image_context);
} else if (disk->readonly) {