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

Commit bc72c44a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11930457

Change-Id: I324e13c3265d1451e156556fc9475ecf268654bf
parents b1b29c9f a8c92eaa

libmodprobe/libmodprobe.cpp

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