Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7f2a98f authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "first_stage_init: Add SIGCHLD handler in first_stage_console" am: ce8aa990 am: 55b5360a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1807489

Change-Id: I1252aaf5a3b82638674f16e03a4ce9aca61520c0
parents 53ae3f5a 55b5360a

init/first_stage_console.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -85,7 +85,10 @@ namespace init { 




void StartConsole(const std::string& cmdline) {

void StartConsole(const std::string& cmdline) {

    bool console = KernelConsolePresent(cmdline);

    bool console = KernelConsolePresent(cmdline);

    // Use a simple sigchld handler -- first_stage_console doesn't need to track or log zombies

    const struct sigaction chld_act { .sa_handler = SIG_DFL, .sa_flags = SA_NOCLDWAIT };





    sigaction(SIGCHLD, &chld_act, nullptr);

    pid_t pid = fork();

    pid_t pid = fork();

    if (pid != 0) {

    if (pid != 0) {

        int status;

        int status;