summaryrefslogtreecommitdiff
path: root/udevd.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2005-10-03 16:36:52 +0200
committerKay Sievers <kay.sievers@suse.de>2005-10-03 16:36:52 +0200
commit133326dc74d9f02686d480b2f4c8a1d9732ba1d6 (patch)
treee1cb67b5f09e7d84b85e45df553f9ee0b222c285 /udevd.c
parentc2df8b5f517216ab7763c1b25655c170cfcee097 (diff)
udevd: fix initial timeout handling
UDEVD_EVENT_TIMEOUT=0 didn't work directly after udevd startup. The whole event timeout handling is not needed since we use netlink. Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'udevd.c')
-rw-r--r--udevd.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/udevd.c b/udevd.c
index e227a64d71..5974d14e8e 100644
--- a/udevd.c
+++ b/udevd.c
@@ -410,8 +410,9 @@ recheck:
/* limit timeout during initialization phase */
if (init_phase) {
- timeout = UDEVD_INIT_EVENT_TIMEOUT;
- dbg("initialization phase, limit timeout to %i seconds", UDEVD_INIT_EVENT_TIMEOUT);
+ if (timeout > UDEVD_INIT_EVENT_TIMEOUT)
+ timeout = UDEVD_INIT_EVENT_TIMEOUT;
+ dbg("initialization phase, timeout %i seconds", timeout);
}
/* move event with expired timeout to the exec list */