Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2011-12-01 12:24:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt", Maintainer is "jfeh...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2011-11-29
17:15:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2011-12-01
12:24:22.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 30 09:53:25 MST 2011 - jfeh...@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
+
+-------------------------------------------------------------------
New:
----
relax-qemu-usergroup-check.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.DIzlyg/_old 2011-12-01 12:24:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DIzlyg/_new 2011-12-01 12:24:23.000000000 +0100
@@ -390,7 +390,8 @@
# 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 @@
%patch200 -p1
%patch201 -p1
%patch202 -p1
+%patch203 -p1
%if %{with_apparmor}
%patch250 -p1
%endif
++++++ libvirtd-defaults.patch ++++++
--- /var/tmp/diff_new_pack.DIzlyg/_old 2011-12-01 12:24:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DIzlyg/_new 2011-12-01 12:24:23.000000000 +0100
@@ -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 @@
# 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;
}
++++++ relax-qemu-usergroup-check.patch ++++++
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);
++++++ suse-qemu-conf.patch ++++++
--- /var/tmp/diff_new_pack.DIzlyg/_old 2011-12-01 12:24:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DIzlyg/_new 2011-12-01 12:24:23.000000000 +0100
@@ -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.
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
