Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6dbec43 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

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

Merge "first_stage_init: if console enabled allow for errors in module loading" am: 283e41de am: 9046f8d0
am: a43bd6e7

Change-Id: Icc611122da38faa8965796a243ca1200a537660a
parents 485cf3b1 a43bd6e7

init/first_stage_init.cpp

+8 −3
Original line number Diff line number Diff line
@@ -239,11 +239,16 @@ int FirstStageMain(int argc, char** argv) { 
    }



    Modprobe m({"/lib/modules"});

    if (!m.LoadListedModules()) {

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

    }