- BR macros with __enabled_disabled macros

[packages/libvirt.git] / libvirt-udevadm-settle.patch

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index c9514fd4d89f2f3bdf648dc5ccf40da8ae872a5c..bb32ff36b8814d55bf25ac87130e5e943d900532 100644 (file)
--- 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.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;
+ 
+     /*