pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modprobe: Use more inclusive language for libmodprobe (Part Deux) 

Remove blacklist

Test: none
Bug: 151950334
Merged-In: I14ed08390a7db0b4b962343c61d60230751047ce
Change-Id: I14ed08390a7db0b4b962343c61d60230751047ce
This commit is contained in:
Mark Salyzyn 2020-06-16 05:14:06 -07:00
parent 507d21905b
commit 21c02bbd4b
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmodprobe/libmodprobe.cpp
View File

@ -198,8 +198,7 @@ bool Modprobe::ParseBlocklistCallback(const std::vector<std::string>& args) {
auto it = args.begin(); auto it = args.begin();
const std::string& type = *it++; const std::string& type = *it++;
// +Legacy if (type != "blocklist") {
if ((type != "blocklist") && (type != "blacklist")) {
LOG(ERROR) << "non-blocklist line encountered in modules.blocklist"; LOG(ERROR) << "non-blocklist line encountered in modules.blocklist";
return false; return false;
} }
@ -334,8 +333,6 @@ Modprobe::Modprobe(const std::vector<std::string>& base_paths, const std::string
auto blocklist_callback = std::bind(&Modprobe::ParseBlocklistCallback, this, _1); auto blocklist_callback = std::bind(&Modprobe::ParseBlocklistCallback, this, _1);
ParseCfg(base_path + "/modules.blocklist", blocklist_callback); ParseCfg(base_path + "/modules.blocklist", blocklist_callback);
// Legacy
ParseCfg(base_path + "/modules.blacklist", blocklist_callback);
} }
ParseKernelCmdlineOptions(); ParseKernelCmdlineOptions();