summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNir Soffer <nirsof@gmail.com>2015-04-19 03:41:26 +0300
committerDavid Herrmann <dh.herrmann@gmail.com>2015-04-20 18:48:55 +0200
commitbf23b9f86f6807c3029a6a46e1999ae0c87ca22a (patch)
treeb1593081b7c4620ac6142391dd2ce8beac163609 /src
parent30a5b7820c403fe18ccbe8e5cb71cb4b49b7f7dc (diff)
udev: settle should return immediately when timeout is 0
udevadm manual says: A value of 0 will check if the queue is empty and always return immediately. However, currently we ignore the deadline if the value is 0, and wait without any limit. Zero timeout behaved according to the documentation until commit ead7c62ab7 (udevadm: settle - kill alarm()). Looking at this patch, it seems that the behavior change was unintended. This patch restores the documented behavior.
Diffstat (limited to 'src')
-rw-r--r--src/udev/udevadm-settle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 2c84ada0b1..437c79408a 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -142,7 +142,7 @@ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
break;
}
- if (timeout > 0 && now(CLOCK_MONOTONIC) >= deadline)
+ if (now(CLOCK_MONOTONIC) >= deadline)
break;
/* wake up when queue is empty */