[systemd-commits] src/udev

[David Herrmann]

 src/udev/udevadm-settle.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7375b3c4871861f100860ea4c2848e66b60e6ca4
Author: Nir Soffer <nirsof at gmail.com>
Date:   Sun Apr 19 02:49:47 2015 +0300

    udev: Fix ping timeout when settle timeout is 0
    
    When running udevadm settle --timeout=0, the ping always times out, and
    udevadm will return 0 without checking the queue state.
    
    (David: Use a reasonable timeout to still get the barrier provided by
     ctrl-ping)

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 437c794..79f4561 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -107,7 +107,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
 
                 uctrl = udev_ctrl_new(udev);
                 if (uctrl != NULL) {
-                        if (udev_ctrl_send_ping(uctrl, timeout) < 0) {
+                        if (udev_ctrl_send_ping(uctrl, MAX(5U, timeout)) < 0) {
                                 log_debug("no connection to daemon");
                                 udev_ctrl_unref(uctrl);
                                 return EXIT_SUCCESS;