diff options
| author | Paul Crowley <paulcrowley@google.com> | 2018-03-01 23:24:20 +0000 |
|---|---|---|
| committer | Paul Crowley <paulcrowley@google.com> | 2018-03-01 23:24:20 +0000 |
| commit | e242a97db547dc73efea1b5287536be66637dc33 (patch) | |
| tree | 4abc4e3afeb7c3cd88e3fe75357377aca6669072 /init/sigchld_handler.cpp | |
| parent | 959b05553576ffc15da4334a5917ce763611ab82 (diff) | |
Revert "If enablefilecrypto or init_user0 fails, reboot into recovery."
This reverts commit 959b05553576ffc15da4334a5917ce763611ab82.
Reason for revert: b/73968735
Bug: 73968735
Test: b/73968735#comment5
Change-Id: Ifce4c029bab7380c60e20cc2b2885beb4a097456
Diffstat (limited to 'init/sigchld_handler.cpp')
| -rw-r--r-- | init/sigchld_handler.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/init/sigchld_handler.cpp b/init/sigchld_handler.cpp index badacaf1c..072a0fb0b 100644 --- a/init/sigchld_handler.cpp +++ b/init/sigchld_handler.cpp @@ -84,15 +84,16 @@ static bool ReapOneProcess() { } } - 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; + 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 (!service) return true; - service->Reap(siginfo); + service->Reap(); if (service->flags() & SVC_TEMPORARY) { ServiceList::GetInstance().RemoveService(*service); |