commit 4d3129cd46c705bb8efe239ea5ae2403f79786f6
author Mark Salyzyn <salyzyn@google.com> Fri Nov 01 15:38:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 15:38:49 2019 -0700
tree 1ab3b6d2a898946003546097078d84856b3924c1
parent 2320f3f90f427557d8c0e60fa175d4be7eb15375
parent 76cf599b8c94a50be6a99eab83b5267523433a99

Merge "first_stage_init: if console enabled allow for errors in module loading" am: 283e41de76
am: 9046f8d00a

Change-Id: I2f2005e211c8ecc768b72904ae92835181854f8d

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