tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Reland "Set the log callback earlier for showing system property set denials"" am: 4c80eb13aa

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

Change-Id: Ibc372749621eea51e24fe7f83e256c8d013f4eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Hong 2023-02-02 14:23:10 +00:00 committed by Automerger Merge Worker
commit 644b8c7eae
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
init/init.cpp
View file

@ -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();