X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-udevadm-settle.patch;h=7c93bf01fac5271dcda938dce9bf40c12f66175b;hb=71a5e15c242981328418b3378f76793bf4661c39;hp=749ade4dcbb1ee01450fafd35c3c51e1988ac162;hpb=392f6a6608e85bb2105c0ad3d5856c033cc35f6a;p=packages%2Flibvirt.git

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 749ade4..7c93bf0 100644
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-3.0.0.orig/src/util/virutil.c libvirt-3.0.0/src/util/virutil.c
---- libvirt-3.0.0.orig/src/util/virutil.c	2017-02-11 16:01:36.648361587 +0000
-+++ libvirt-3.0.0/src/util/virutil.c	2017-02-11 16:01:56.797361360 +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-5.10.0.orig/src/util/virutil.c libvirt-5.10.0/src/util/virutil.c
+--- libvirt-5.10.0.orig/src/util/virutil.c	2019-12-08 00:45:32.458000000 +0100
++++ libvirt-5.10.0/src/util/virutil.c	2019-12-08 00:45:46.793000000 +0100
+@@ -1485,7 +1485,7 @@
+     if (!(udev = virFindFileInPath(UDEVADM)))
+         return;
+ 
+-    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
++    if (!(cmd = virCommandNewArgList(udev, "settle", "--timeout=10", NULL)))
+         return;
+ 
+     /*