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

Commit 4c80eb13 authored by Alex Hong's avatar Alex Hong Committed by Gerrit Code Review
Browse files

Merge "Reland "Set the log callback earlier for showing system property set denials""

parents a0427c41 057b9421

init/init.cpp

+2 −1
Original line number Diff line number Diff line
@@ -952,6 +952,8 @@ int SecondStageMain(int argc, char** argv) { 
    InitKernelLogging(argv);

    LOG(INFO) << "init second stage started!";



    SelinuxSetupKernelLogging();



    // Update $PATH in the case the second stage init is newer than first stage init, where it is

    // first set.

    if (setenv("PATH", _PATH_DEFPATH, 1) != 0) {
@@ -1012,7 +1014,6 @@ int SecondStageMain(int argc, char** argv) { 
    MountExtraFilesystems();



    // Now set up SELinux for second stage.

    SelinuxSetupKernelLogging();

    SelabelInitialize();

    SelinuxRestoreContext();