commit 4c80eb13aaf4bbc1926dbe4dad1266b0ed7e4cf5
author Alex Hong <rurumihong@google.com> Thu Feb 02 14:04:35 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 02 14:04:35 2023 +0000
tree 0cb9e134a4b07cb8cbc010a947b9d8415113d80d
parent a0427c41c1f0621b33612318e5a9a29a41cbbb47
parent 057b94215ad703db32cc88cef24728b8aaab3bee

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

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 4262191..f964c60 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -952,6 +952,8 @@
     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 @@
     MountExtraFilesystems();
 
     // Now set up SELinux for second stage.
-    SelinuxSetupKernelLogging();
     SelabelInitialize();
     SelinuxRestoreContext();