coldplug: only start hotplug timer after udevtrigger finished

Currently the last event timer for hotplug is
started after the udevtrigger process is forked.

Starting the timer means that the first hotplug
event must come in before the timer expires.
During this time the kernel must load the binary
of the udevtrigger from the underlying rootfs
which can be time consuming on slow systems.

On such systems, the timer expires before the
first hotplug event happens which results in
broken behaviour. Due to the missing device nodes,
not the ubus nor the procd code works correctly in
that case.

Change the code to only start the hotplug last
event timer after the udevtrigger process finishes.
This ensures that the delay caused by accessing the
underlying filesystem does not affects the desired
behaviour.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

diff --git a/coldplug.c b/coldplug.c
index d5997f8279960fc2f366dc3795158b8c05091ecf..b8c0eaf1c2c5678f14319213791cedb68bea162e 100644 (file)
--- a/coldplug.c
+++ b/coldplug.c
@@ -34,6 +34,7 @@ static void coldplug_complete(struct uloop_timeout *t)
 static void udevtrigger_complete(struct uloop_process *proc, int ret)
 {
        DEBUG(2, "Finished udevtrigger\n");
+       hotplug_last_event(coldplug_complete);
 }
 
 void procd_coldplug(void)
@@ -59,7 +60,6 @@ void procd_coldplug(void)
                return;
        }
 
-       hotplug_last_event(coldplug_complete);
        uloop_process_add(&udevtrigger);
 
        DEBUG(2, "Launched coldplug instance, pid=%d\n", (int) udevtrigger.pid);