commit 9debda17abd8c7043cf2fe2333b89c9f25cf1504
author Mark Salyzyn <salyzyn@google.com> Tue Jun 16 05:14:06 2020 -0700
committer Mark Salyzyn <salyzyn@google.com> Tue Jun 16 05:14:09 2020 -0700
tree b02c1e43598e647806a1c8923f2ddec1f982e307
parent 703fb74fb5d7b806f188f2814f8dd770add26eeb

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

Remove blacklist

Test: none
Change-Id: I14ed08390a7db0b4b962343c61d60230751047ce

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 07504c1..5a6ae8b 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -198,8 +198,7 @@
     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 @@
 
         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();