anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0140-udev-Fix-ping-timeout-when-settle-timeout-is-0.patch

923a60
From e7cd53f60cc2cb5e98efa0e88cfd0e7dd8325085 Mon Sep 17 00:00:00 2001
923a60
From: Nir Soffer <nirsof@gmail.com>
923a60
Date: Sun, 19 Apr 2015 02:49:47 +0300
923a60
Subject: [PATCH] udev: Fix ping timeout when settle timeout is 0
923a60
923a60
When running udevadm settle --timeout=0, the ping always times out, and
923a60
udevadm will return 0 without checking the queue state.
923a60
923a60
(David: Use a reasonable timeout to still get the barrier provided by
923a60
 ctrl-ping)
923a60
923a60
Cherry-picked from: 7375b3c4871861f100860ea4c2848e66b60e6ca4
923a60
Resolves: #1210981
923a60
---
923a60
 src/udev/udevadm-settle.c | 2 +-
923a60
 1 file changed, 1 insertion(+), 1 deletion(-)
923a60
923a60
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
923a60
index 40e3e28b1e..33597bc209 100644
923a60
--- a/src/udev/udevadm-settle.c
923a60
+++ b/src/udev/udevadm-settle.c
923a60
@@ -114,7 +114,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
923a60
 
923a60
                 uctrl = udev_ctrl_new(udev);
923a60
                 if (uctrl != NULL) {
923a60
-                        if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
923a60
+                        if (udev_ctrl_send_ping(uctrl, MAX(5U, timeout)) < 0) {
923a60
                                 log_debug("no connection to daemon");
923a60
                                 udev_ctrl_unref(uctrl);
923a60
                                 return EXIT_SUCCESS;