From 1f84e42e19ac9d0b4e84983317207d0b8718d1d1 Mon Sep 17 00:00:00 2001 From: Nir Soffer Date: Sun, 19 Apr 2015 02:49:47 +0300 Subject: 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) Signed-off-by: Anthony G. Basile --- src/udev/udevadm-settle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c index 40e3e28b1e..33597bc209 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; -- cgit v1.2.3-54-g00ecf