commit 1db2d481eab6bba6ccbf853e46cea990c1600930
author Chungkai Mei <chungkai@google.com> Thu Apr 11 08:49:06 2024 +0000
committer Juan Yescas <jyescas@google.com> Mon Apr 22 19:56:46 2024 -0700
tree 9876ac9bf75bb7b0e4a332091750c9c90d227854
parent bbdc19b7e1394b17d7f7822d5516e2f0dcd729e4

libmodprobe: remove dummy parameters for kernel

we consume load_sequential only in libmodprobe, so remove this parameter
before sending them into kernel layer

Bug: 332435366
Test: Built and boot husky targets
Change-Id: I37e63723d3c8d4fd8ca1fda682b344a721b9a637
Signed-off-by: Chungkai Mei <chungkai@google.com>

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 5023c79..1a40da1 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -484,7 +484,11 @@
                 return false;
             }
 
-            if (module_options_[cnd_last].find("load_sequential=1") != std::string::npos) {
+            std::string str = "load_sequential=1";
+            auto it = module_options_[cnd_last].find(str);
+            if (it != std::string::npos) {
+                module_options_[cnd_last].erase(it, it + str.size());
+
                 if (!LoadWithAliases(cnd_last, true)) {
                     return false;
                 }