diff options
| author | Nir Soffer <nirsof@gmail.com> | 2015-04-19 02:49:47 +0300 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2015-04-29 08:55:33 -0400 |
| commit | a8d917c7e49e3111aaf7bd80cd1b8731c4ea81ed (patch) | |
| tree | d71a7b8d8fb60dfb187961a1131f7b2880f28214 | |
| parent | 08a2ba2c6981ec9fef16639d1bed16a40406f0d0 (diff) | |
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)
(cherry picked from commit 7375b3c4871861f100860ea4c2848e66b60e6ca4)
| -rw-r--r-- | src/udev/udevadm-settle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index 40e3e28b1..33597bc20 100644 --- a/src/udev/udevadm-settle.c +++ b/src/udev/udevadm-settle.c @@ -114,7 +114,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; |