commit c73b21558be59369aceb9a62174343ff2837b9f5
author Paul Crowley <paulcrowley@google.com> Fri Apr 13 17:38:57 2018 +0000
committer Paul Crowley <paulcrowley@google.com> Tue Apr 17 09:03:57 2018 -0700
tree d758a6fb43c18e4ee025afe0678e185eca7464f9
parent 07de83831f9a2bf67e1c4a4df72baed42b26c7e9

Re-land "If enablefilecrypto or init_user0 fails, reboot into recovery."

An earlier such change was reverted in commit e242a97db547dc73efea1b5287536be66637dc33.

Bug: 70487538
Test: ensure that angler can boot
Merged-In: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0
Change-Id: Id5f57fce1c9b817a2650e0c848143d8a0d286bf0

init/sigchld_handler.cpp

diff --git a/init/sigchld_handler.cpp b/init/sigchld_handler.cpp
index 3ec76df..0b03324 100644
--- a/init/sigchld_handler.cpp
+++ b/init/sigchld_handler.cpp
@@ -81,16 +81,15 @@
         }
     }
 
-    auto status = siginfo.si_status;
-    if (WIFEXITED(status)) {
-        LOG(INFO) << name << " exited with status " << WEXITSTATUS(status) << wait_string;
-    } else if (WIFSIGNALED(status)) {
-        LOG(INFO) << name << " killed by signal " << WTERMSIG(status) << wait_string;
+    if (siginfo.si_code == CLD_EXITED) {
+        LOG(INFO) << name << " exited with status " << siginfo.si_status << wait_string;
+    } else {
+        LOG(INFO) << name << " received signal " << siginfo.si_status << wait_string;
     }
 
     if (!service) return true;
 
-    service->Reap();
+    service->Reap(siginfo);
 
     if (service->flags() & SVC_TEMPORARY) {
         ServiceList::GetInstance().RemoveService(*service);