X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-udevadm-settle.patch;h=bb32ff36b8814d55bf25ac87130e5e943d900532;hb=bc937a84a2db6acd07b2996f197d3db2f38922fb;hp=cf4c2dd03c701746eca6ec77e598982c9dc5f7d7;hpb=220284abd9e3eba309f18d911bc9f86d1293d677;p=packages%2Flibvirt.git

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index cf4c2dd..bb32ff3 100644
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-2.3.0.orig/src/util/virutil.c libvirt-2.3.0/src/util/virutil.c
---- libvirt-2.3.0.orig/src/util/virutil.c	2016-10-28 19:17:48.496715000 +0000
-+++ libvirt-2.3.0/src/util/virutil.c	2016-10-28 19:18:02.376715000 +0000
-@@ -1586,7 +1586,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
- 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 -ur libvirt-6.10.0.orig/src/util/virutil.c libvirt-6.10.0/src/util/virutil.c
+--- libvirt-6.10.0.orig/src/util/virutil.c	2021-01-01 20:41:27.420692686 +0100
++++ libvirt-6.10.0/src/util/virutil.c	2021-01-01 20:41:48.503692686 +0100
+@@ -1316,7 +1316,7 @@
+     if (!(udev = virFindFileInPath(UDEVADM)))
+         return;
+ 
+-    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
++    if (!(cmd = virCommandNewArgList(udev, "settle", "--timeout=10", NULL)))
+         return;
+ 
+     /*