commit 46dd23ebd8cce8b088eb90fa702da13382aaf02a
author Mark Salyzyn <salyzyn@google.com> Fri Nov 01 15:45:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 15:45:00 2019 -0700
tree 3afec4cdbf08b3bd8d1b2737b92208b41c0e04a1
parent a64c07a99bc016ac12e835bcb0a5da716a16defc
parent 4d3129cd46c705bb8efe239ea5ae2403f79786f6

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

Change-Id: Icc611122da38faa8965796a243ca1200a537660a

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