[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.12-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 202939f6358d38d81bbdcc131c055eabe2713741
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jun 14 19:37:26 2012 +0200

    New patch Reduce-udevadm-settle-timeout-to-10-seconds.patch
    
    Reduce udevadm settle timeout to 10 seconds
    
    Closes: #663931

diff --git a/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
new file mode 100644
index 0000000..c3cbc9d
--- /dev/null
+++ b/debian/patches/Reduce-udevadm-settle-timeout-to-10-seconds.patch
@@ -0,0 +1,24 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 4 Jun 2012 16:18:52 +0200
+Subject: Reduce udevadm settle timeout to 10 seconds
+
+This isn't a proper fix but it will make virt-manager at least start.
+
+Closes: #663931
+---
+ src/util/util.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/util.c b/src/util/util.c
+index 48358b2..c026bc8 100644
+--- a/src/util/util.c
++++ b/src/util/util.c
+@@ -2593,7 +2593,7 @@ virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED)
+ 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
diff --git a/debian/patches/series b/debian/patches/series
index 7b7213e..affc972 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ Disable-gnulib-s-test-nonplocking-pipe.sh.patch
 Disable-failing-virnetsockettest.patch
 Don-t-fail-if-we-can-t-setup-avahi.patch
 Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch
+Reduce-udevadm-settle-timeout-to-10-seconds.patch

-- 
Libvirt Debian packaging