commit 123f6cbc6e313706cb8fe5063f117609f1708a39
author Mark Salyzyn <salyzyn@google.com> Thu Oct 31 08:02:10 2019 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Oct 31 10:30:45 2019 -0700
tree 7750156df8b075e38850f60d42ec4eb847f47cce
parent b2715eb85086d13dec46ea3c28bc9962df216bf4

first_stage_init: if console enabled allow for errors in module loading

Allow for module load errors if first stage console is enabled, userdebug
development builds, load what you can and continue.

Test: compile
Bug: 141311820
Change-Id: I30f3ee1129373f6ffedcf03807c212c60d4c39aa

init/first_stage_init.cpp

diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index fd2d766..ac44796 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -239,11 +239,16 @@
     }
 
     Modprobe m({"/lib/modules"});
-    if (!m.LoadListedModules()) {
-        LOG(FATAL) << "Failed to load kernel modules";
+    auto want_console = ALLOW_FIRST_STAGE_CONSOLE && FirstStageConsole(cmdline);
+    if (!m.LoadListedModules(!want_console)) {
+        if (want_console) {
+            LOG(ERROR) << "Failed to load kernel modules, starting console";
+        } else {
+            LOG(FATAL) << "Failed to load kernel modules";
+        }
     }
 
-    if (ALLOW_FIRST_STAGE_CONSOLE && FirstStageConsole(cmdline)) {
+    if (want_console) {
         StartConsole();
     }