Merge "first_stage_init: if console enabled allow for errors in module loading" (283e41de) · Commits · e / os / android_system_core

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