commit 7448c7c998d4c36e8e260e0cba66bf347f11f5cf
Author: Marcin Krol <[email protected]>
Date: Mon Jul 22 13:06:09 2013 +0000
- add 10 seconds timeout to udevadm settle called by libvirtd,
workarounds libvirt bug (details of problem available here:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663931#68
note: problem seems old and all major distros uses this fix,
its weird that upstream hasn't fixed it already)
libvirt-udevadm-settle.patch | 12 ++++++++++++
libvirt.spec | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 69d2037..d3a9ce2 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -34,7 +34,7 @@ Summary: Toolkit to interact with virtualization
capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
Version: 1.1.0
-Release: 1
+Release: 2
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
@@ -46,6 +46,7 @@ Patch1: %{name}-lxc.patch
Patch2: %{name}-qemu-acl.patch
Patch3: %{name}-xend.patch
Patch4: virtlockd.init.patch
+Patch5: %{name}-udevadm-settle.patch
URL: http://www.libvirt.org/
BuildRequires: audit-libs-devel
BuildRequires: augeas-devel
@@ -428,6 +429,7 @@ Sondy systemtap/dtrace dla libvirt.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# weird translations
%{__rm} po/{my,eu_ES}.{po,gmo}
diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
new file mode 100644
index 0000000..a645d9f
--- /dev/null
+++ b/libvirt-udevadm-settle.patch
@@ -0,0 +1,12 @@
+diff -urP libvirt-1.1.0.orig/src/util/virutil.c
libvirt-1.1.0/src/util/virutil.c
+--- libvirt-1.1.0.orig/src/util/virutil.c 2013-07-01 03:08:36.000000000
+0000
++++ libvirt-1.1.0/src/util/virutil.c 2013-07-22 12:58:14.053179206 +0000
+@@ -1419,7 +1419,7 @@
+ void virFileWaitForDevices(void)
+ {
+ # ifdef UDEVADM
+- const char *const settleprog[] = { UDEVADM, "settle", NULL };
++ const char *const settleprog[] = { UDEVADM, "settle", "--timeout=10" ,
NULL };
+ # else
+ const char *const settleprog[] = { UDEVSETTLE, NULL };
+ # endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/7448c7c998d4c36e8e260e0cba66bf347f11f5cf
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
