rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

- Allow qemu driver (and hence libvirtd) to load when qemu

Browse Source 
user:group does not exist.  The kvm or qemu package, which may
  not exist on a xen host, creates qemu user:group.
  relax-qemu-usergroup-check.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=179
This commit is contained in:
James Fehlig 2011-11-30 16:55:23 +00:00 committed by Git OBS Bridge
parent a05f801ae3
commit 6e6c8a48ca
5 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libvirt.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 30 09:53:25 MST 2011 - jfehlig@suse.com
- Allow qemu driver (and hence libvirtd) to load when qemu
user:group does not exist. The kvm or qemu package, which may
not exist on a xen host, creates qemu user:group.
relax-qemu-usergroup-check.patch
-------------------------------------------------------------------
Mon Nov 28 14:57:04 MST 2011 - jfehlig@suse.com

4
libvirt.spec
View File

@ -390,7 +390,8 @@ Patch103: xen-domctl-ver8.patch
# Our patches
Patch200: libvirtd-defaults.patch
Patch201: use-init-script-redhat.patch
Patch202: suse-qemu-conf.patch
Patch202: relax-qemu-usergroup-check.patch
Patch203: suse-qemu-conf.patch
%if %{with_apparmor}
Patch250: install-apparmor-profiles.patch
%endif
@ -514,6 +515,7 @@ Authors:
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1
%if %{with_apparmor}
%patch250 -p1
%endif

12
libvirtd-defaults.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.6/daemon/libvirtd.conf
Index: libvirt-0.9.7/daemon/libvirtd.conf
===================================================================
--- libvirt-0.9.6.orig/daemon/libvirtd.conf
+++ libvirt-0.9.6/daemon/libvirtd.conf
--- libvirt-0.9.7.orig/daemon/libvirtd.conf
+++ libvirt-0.9.7/daemon/libvirtd.conf
@@ -18,8 +18,8 @@
# It is necessary to setup a CA and issue server certificates before
# using this capability.
@ -28,10 +28,10 @@ Index: libvirt-0.9.6/daemon/libvirtd.conf
# Override the default mDNS advertizement name. This must be
# unique on the immediate broadcast network.
Index: libvirt-0.9.6/daemon/libvirtd.c
Index: libvirt-0.9.7/daemon/libvirtd.c
===================================================================
--- libvirt-0.9.6.orig/daemon/libvirtd.c
+++ libvirt-0.9.6/daemon/libvirtd.c
--- libvirt-0.9.7.orig/daemon/libvirtd.c
+++ libvirt-0.9.7/daemon/libvirtd.c
@@ -846,7 +846,7 @@ daemonConfigNew(bool privileged ATTRIBUT
return NULL;
}

35
relax-qemu-usergroup-check.patch Normal file
View File

@ -0,0 +1,35 @@
Allow qemu driver (and hence libvirtd) to load when qemu
user:group does not exist. The kvm package, which may not
exist on a xen host, creates qemu user:group.
A better (future) solution would be to build the libvirtd
drivers as loadable modules instead of built-in to the
daemon. Then the qemu driver would only be loaded when needed,
which would never be the case on a xen-only configuration.
Index: libvirt-0.9.7/src/qemu/qemu_conf.c
===================================================================
--- libvirt-0.9.7.orig/src/qemu/qemu_conf.c
+++ libvirt-0.9.7/src/qemu/qemu_conf.c
@@ -255,9 +255,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}
if (virGetUserID(user, &driver->user) < 0) {
- VIR_FREE(user);
- virConfFree(conf);
- return -1;
+ VIR_WARN("User %s does not exist! Continuing...", user);
}
VIR_FREE(user);
@@ -270,9 +268,7 @@ int qemudLoadDriverConfig(struct qemud_d
return -1;
}
if (virGetGroupID(group, &driver->group) < 0) {
- VIR_FREE(group);
- virConfFree(conf);
- return -1;
+ VIR_WARN("Group %s does not exist! Continuing...", group);
}
VIR_FREE(group);

6
suse-qemu-conf.patch
View File

@ -1,7 +1,7 @@
Index: libvirt-0.9.6/src/qemu/qemu.conf
Index: libvirt-0.9.7/src/qemu/qemu.conf
===================================================================
--- libvirt-0.9.6.orig/src/qemu/qemu.conf
+++ libvirt-0.9.6/src/qemu/qemu.conf
--- libvirt-0.9.7.orig/src/qemu/qemu.conf
+++ libvirt-0.9.7/src/qemu/qemu.conf
@@ -136,7 +136,16 @@
# leaving SELinux enabled for the host in general, then set this
# to 'none' instead.