ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "first_stage_init: if console enabled allow for errors in module loading"

Browse source
This commit is contained in:
Mark Salyzyn 2019-11-01 21:52:42 +00:00 • committed by Gerrit Code Review
commit 283e41de76
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/first_stage_init.cpp
View file

@ -239,11 +239,16 @@ int FirstStageMain(int argc, char** argv) {
}
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();
}