From 21e20cb4ad106b9d49ff24652a5cd47380905d4d Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 4 Jan 2008 15:10:47 +0000 Subject: init: wait for orphaned children too while waiting for sysinit-like processes (Harald Küthe ) --- init/init.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index 68a59d8..f7eb8f3 100644 --- a/init/init.c +++ b/init/init.c @@ -97,10 +97,16 @@ static const char *const environment[] = { static void delete_init_action(struct init_action *a); static void halt_reboot_pwoff(int sig) ATTRIBUTE_NORETURN; -/* TODO: move to libbb? */ -static int waitfor(pid_t runpid) +static void waitfor(pid_t pid) { - return safe_waitpid(runpid, NULL, 0); + /* waitfor(run(x)): protect against failed fork inside run() */ + if (pid <= 0) + return; + + /* Wait for any child (prevent zombies from exiting orphaned processes) + * but exit the loop only when specified one has exited. */ + while (wait(NULL) != pid) + continue; } static void loop_forever(void) ATTRIBUTE_NORETURN; -- cgit v1.1