rpms/libvirt/F-11 libvirt-0.6.2-fix-nosource-label.patch, NONE, 1.1 libvirt.spec, 1.129, 1.130

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/libvirt/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14954

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.2-fix-nosource-label.patch 
Log Message:
Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)


libvirt-0.6.2-fix-nosource-label.patch:

--- NEW FILE libvirt-0.6.2-fix-nosource-label.patch ---
diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c
--- libvirt-0.6.2/src/security_selinux.c	2009-05-10 22:04:25.000000000 -0400
+++ new/src/security_selinux.c	2009-05-10 22:06:09.000000000 -0400
@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP
 {
     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) {


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-11/libvirt.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- libvirt.spec	7 May 2009 19:08:42 -0000	1.129
+++ libvirt.spec	11 May 2009 02:28:23 -0000	1.130
@@ -66,7 +66,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.6.2
-Release: 7%{?dist}%{?extra_release}
+Release: 8%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -81,6 +81,8 @@ Patch2: libvirt-0.6.3-hostdev-managed.pa
 Patch3: libvirt-0.6.3-refresh-qemu-caps.patch
 # Enable migration with qemu 0.10
 Patch4: libvirt-0.6.2-enable-qemu-0-10-migration.patch
+# Don't try to label a disk with no path (e.g. empty cdrom) (bz 499569)
+Patch5: libvirt-0.6.2-fix-nosource-label.patch
 
 # Not for upstream. Temporary hack till PulseAudio autostart
 # problems are sorted out when SELinux enforcing
@@ -240,6 +242,7 @@ of recent versions of Linux (and other O
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %patch200 -p0
 
@@ -563,6 +566,9 @@ fi
 %endif
 
 %changelog
+* Sun May 10 2009 Cole Robinson <crobinso at redhat.com> - 0.6.2-8.fc11
+- Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)
+
 * Thu May  7 2009 Mark McLoughlin <markmc at redhat.com> - 0.6.2-7.fc11
 - Enable migration for qemu 0.10 (bug #499704)