From: Kay Sievers Date: Mon, 3 Oct 2005 14:36:52 +0000 (+0200) Subject: udevd: fix initial timeout handling X-Git-Tag: 174~2528 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=133326dc74d9f02686d480b2f4c8a1d9732ba1d6;ds=sidebyside 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 --- diff --git a/udevd.c b/udevd.c index e227a64d7..5974d14e8 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 */