From 9286d16672b26c9fe7cb9dbf827a43a910df5559 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sat, 1 Nov 2014 23:23:47 +0100
Subject: kmodloader takes longer than wdt timeout

on systms with slow flash the watchdog will trigger when a lot of modules are
included in the image.

Signed-off-by: John Crispin <blogic@openwrt.org>
---
 initd/init.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'initd/init.c')

diff --git a/initd/init.c b/initd/init.c
index d8490f8..0d201bc 100644
--- a/initd/init.c
+++ b/initd/init.c
@@ -99,10 +99,18 @@ main(int argc, char **argv)
 		ERROR("Failed to start kmodloader\n");
 		exit(-1);
 	}
-	if (pid <= 0)
+	if (pid <= 0) {
 		ERROR("Failed to start kmodloader instance\n");
-	else
-		waitpid(pid, NULL, 0);
+	} else {
+		int i;
+
+		for (i = 0; i < 120; i++) {
+			if (waitpid(pid, NULL, WNOHANG) > 0)
+				break;
+			sleep(1);
+			watchdog_ping();
+		}
+	}
 	uloop_init();
 	preinit();
 	uloop_run();
-- 
cgit v1.2.3