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

Commit 40af0929 authored by Paul Lawrence's avatar Paul Lawrence Committed by Rom Lemarchand
Browse files

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
parent 81b857f3

init/builtins.c

+6 −1
Original line number Diff line number Diff line
@@ -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 {