- 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 ce4f100f8e16b2bda074e0d4c830afcca0fa978c..a9c2a12ec21c6427d51f22c9a0969ec42b3e197a 100644 (file)
--- a/libvirt-udevadm-settle.patch
+++ b/libvirt-udevadm-settle.patch
@@ -1,12 +1,12 @@
-diff -urp libvirt-1.3.3.orig/src/util/virutil.c libvirt-1.3.3/src/util/virutil.c
---- libvirt-1.3.3.orig/src/util/virutil.c      2016-04-14 10:31:32.419170000 +0000
-+++ libvirt-1.3.3/src/util/virutil.c   2016-04-14 10:31:45.518170000 +0000
-@@ -1535,7 +1535,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-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;
+ 
+     /*