aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-01-04 15:10:47 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2008-01-04 15:10:47 +0000
commit21e20cb4ad106b9d49ff24652a5cd47380905d4d (patch)
treebf568707e67d1857dc844dbdddbd18e57fe06ad4 /init
parent4dada747e54b11f05db1beda3f4653ffe432255c (diff)
downloadbusybox-21e20cb4ad106b9d49ff24652a5cd47380905d4d.tar.gz
busybox-21e20cb4ad106b9d49ff24652a5cd47380905d4d.tar.bz2
init: wait for orphaned children too while waiting
for sysinit-like processes (Harald K├╝the <harald-tuxbox@arcor.de>)
Diffstat (limited to 'init')
-rw-r--r--init/init.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/init/init.c b/init/init.c
index 68a59d88e..f7eb8f34b 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;