From 40af09297f9d60a3cfd4a186ff294cef6255a9df Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Tue, 16 Sep 2014 14:31:23 -0700 Subject: Fix charger mode on first boot of force encrypt devices waitpid breaks whenever child status signals. Need to loop, continuing on errno EINTR Bug: 17515976 Change-Id: Ibb29056a38b3c90dc7904de8c6aedb5a362e511d --- init/builtins.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'init') diff --git a/init/builtins.c b/init/builtins.c index de83c93..8dbaab7 100644 --- a/init/builtins.c +++ b/init/builtins.c @@ -515,7 +515,12 @@ int do_mount_all(int nargs, char **args) pid = fork(); if (pid > 0) { /* Parent. Wait for the child to return */ - waitpid(pid, &status, 0); + int wp_ret = TEMP_FAILURE_RETRY(waitpid(pid, &status, 0)); + if (wp_ret < 0) { + /* Unexpected error code. We will continue anyway. */ + NOTICE("waitpid failed rc=%d, errno=%d\n", wp_ret, errno); + } + if (WIFEXITED(status)) { ret = WEXITSTATUS(status); } else { -- cgit v1.1