X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-udevadm-settle.patch;h=19ac1460dbf1054c561bd80fdf15534c6a3e5542;hb=fb9ba66439cd633004f1975095e9ddb1b47a0234;hp=c9514fd4d89f2f3bdf648dc5ccf40da8ae872a5c;hpb=f08e2de848020f421ff12e52ee56c58506abe1f6;p=packages%2Flibvirt.git

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index c9514fd..19ac146 100644
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-4.0.0.orig/src/util/virutil.c libvirt-4.0.0/src/util/virutil.c
---- libvirt-4.0.0.orig/src/util/virutil.c	2018-01-24 12:11:07.300489931 +0000
-+++ libvirt-4.0.0/src/util/virutil.c	2018-01-24 12:12:20.303485580 +0000
-@@ -1596,7 +1596,7 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gi
- void virWaitForDevices(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.1.0.orig/src/util/virutil.c libvirt-6.1.0/src/util/virutil.c
+--- libvirt-6.1.0.orig/src/util/virutil.c	2020-03-06 09:50:30.870000000 +0100
++++ libvirt-6.1.0/src/util/virutil.c	2020-03-06 09:50:47.350000000 +0100
+@@ -1332,7 +1332,7 @@
+     if (!(udev = virFindFileInPath(UDEVADM)))
+         return;
+ 
+-    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
++    if (!(cmd = virCommandNewArgList(udev, "settle", "--timeout=10", NULL)))
+         return;
+ 
+     /*