tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "first_stage_init: load modules in modules.load.recovery in recovery" am: 51abcc5633 am: 7b491d86fc

Browse source 
Change-Id: I1a51b5cda4ebb31a26bafddabbd1df36d439da35
This commit is contained in:
Treehugger Robot 2020-04-08 18:12:08 +00:00 committed by Automerger Merge Worker
commit 95242dd29f
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
init/first_stage_init.cpp
View file

@ -234,7 +234,16 @@ int FirstStageMain(int argc, char** argv) {
old_root_dir.reset();
}
Modprobe m({"/lib/modules"});
std::string module_load_file = "modules.load";
if (IsRecoveryMode() && !ForceNormalBoot(cmdline)) {
struct stat fileStat;
std::string recovery_load_path = "/lib/modules/modules.load.recovery";
if (!stat(recovery_load_path.c_str(), &fileStat)) {
module_load_file = "modules.load.recovery";
}
}
Modprobe m({"/lib/modules"}, module_load_file);
auto want_console = ALLOW_FIRST_STAGE_CONSOLE && FirstStageConsole(cmdline);
if (!m.LoadListedModules(!want_console)) {
if (want_console) {

2
libmodprobe/include/modprobe/modprobe.h
View file

@ -24,7 +24,7 @@
class Modprobe {
public:
Modprobe(const std::vector<std::string>&);
Modprobe(const std::vector<std::string>&, const std::string load_file = "modules.load");
bool LoadListedModules(bool strict = true);
bool LoadWithAliases(const std::string& module_name, bool strict,

4
libmodprobe/libmodprobe.cpp
View file

@ -312,7 +312,7 @@ void Modprobe::ParseKernelCmdlineOptions(void) {
}
}
Modprobe::Modprobe(const std::vector<std::string>& base_paths) {
Modprobe::Modprobe(const std::vector<std::string>& base_paths, const std::string load_file) {
using namespace std::placeholders;
for (const auto& base_path : base_paths) {
@ -326,7 +326,7 @@ Modprobe::Modprobe(const std::vector<std::string>& base_paths) {
ParseCfg(base_path + "/modules.softdep", softdep_callback);
auto load_callback = std::bind(&Modprobe::ParseLoadCallback, this, _1);
ParseCfg(base_path + "/modules.load", load_callback);
ParseCfg(base_path + "/" + load_file, load_callback);
auto options_callback = std::bind(&Modprobe::ParseOptionsCallback, this, _1);
ParseCfg(base_path + "/modules.options", options_callback);