From 7e9b8186c4c9684ca4ba37a9d65b8f0308039392 Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 16 Jun 2020 05:14:06 -0700
Subject: [PATCH] modprobe: Use more inclusive language for libmodprobe (Part
 Deux)

Remove blacklist

Test: none
Bug: 151950334
Merged-In: I14ed08390a7db0b4b962343c61d60230751047ce
Change-Id: I14ed08390a7db0b4b962343c61d60230751047ce

Former-commit-id: 21c02bbd4bc274a4e74fa030b0ca086bd87f9dea
---
 libmodprobe/libmodprobe.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 07504c158..5a6ae8be1 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -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();