openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev

This commit is contained in:
TreeHugger Robot 2020-06-22 18:12:14 +00:00 committed by Android (Google) Code Review
parent da0a2ae786 21c02bbd4b
commit a8c92eaae7
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();
const std::string& type = *it++;
// +Legacy
if ((type != "blocklist") && (type != "blacklist")) {
if (type != "blocklist") {
LOG(ERROR) << "non-blocklist line encountered in modules.blocklist";
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);
ParseCfg(base_path + "/modules.blocklist", blocklist_callback);
// Legacy
ParseCfg(base_path + "/modules.blacklist", blocklist_callback);
}
ParseKernelCmdlineOptions();