- updated to 9.5.0, added zfs bcond

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

diff --git a/libvirt-udevadm-settle.patch b/libvirt-udevadm-settle.patch
index 05ecb5169c591a17d6e898facf7a034da522bef1..a9c2a12ec21c6427d51f22c9a0969ec42b3e197a 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-4.1.0.orig/src/util/virutil.c libvirt-4.1.0/src/util/virutil.c
---- libvirt-4.1.0.orig/src/util/virutil.c      2018-02-26 09:02:18.000000000 +0000
-+++ libvirt-4.1.0/src/util/virutil.c   2018-03-12 10:56:34.535946323 +0000
-@@ -1600,7 +1600,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-9.5.0.orig/src/util/virutil.c libvirt-9.5.0/src/util/virutil.c
+--- libvirt-9.5.0.orig/src/util/virutil.c      2023-07-20 17:20:08.053693913 +0200
++++ libvirt-9.5.0/src/util/virutil.c   2023-07-20 17:20:22.422899676 +0200
+@@ -1246,7 +1246,7 @@
+     if (!(udev = virFindFileInPath(UDEVADM)))
+         return;
+ 
+-    if (!(cmd = virCommandNewArgList(udev, "settle", NULL)))
++    if (!(cmd = virCommandNewArgList(udev, "settle", "--timeout=10", NULL)))
+         return;
+ 
+     /*