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

Commit a8c92eaa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents da0a2ae7 21c02bbd

libmodprobe/libmodprobe.cpp

+1 −4
Original line number Original line Diff line number Diff line
@@ -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();