Old patch didn't apply in kodji ??? Daniel
This commit is contained in:
parent
cdd5b3d62d
commit
4f644ce267
@ -1,13 +0,0 @@
|
|||||||
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) {
|
|
@ -1,8 +1,8 @@
|
|||||||
--- src/qemu_conf.c.orig 2009-04-02 11:50:10.000000000 +0200
|
--- src/qemu_conf.c.orig 2009-05-29 19:24:59.000000000 +0200
|
||||||
+++ src/qemu_conf.c 2009-04-03 17:46:59.000000000 +0200
|
+++ src/qemu_conf.c 2009-05-29 19:19:39.000000000 +0200
|
||||||
@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr
|
@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr
|
||||||
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
||||||
char domid[50];
|
char domid[50];
|
||||||
char *pidfile;
|
|
||||||
const char *cpu = NULL;
|
const char *cpu = NULL;
|
||||||
+ int skipSound = 0;
|
+ int skipSound = 0;
|
||||||
+
|
+
|
||||||
@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
uname_normalize(&ut);
|
uname_normalize(&ut);
|
||||||
|
|
||||||
@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr
|
@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Add sound hardware */
|
/* Add sound hardware */
|
@ -66,7 +66,7 @@ Source: libvirt-%{version}.tar.gz
|
|||||||
|
|
||||||
# Temporary hack till PulseAudio autostart problems are sorted
|
# Temporary hack till PulseAudio autostart problems are sorted
|
||||||
# out when SELinux enforcing (bz 486112)
|
# out when SELinux enforcing (bz 486112)
|
||||||
Patch200: libvirt-0.6.3-svirt-sound.patch
|
Patch200: libvirt-0.6.4-svirt-sound.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
URL: http://libvirt.org/
|
URL: http://libvirt.org/
|
||||||
|
Loading…
Reference in New Issue
Block a user