commit a64c07a99bc016ac12e835bcb0a5da716a16defc
author Mark Salyzyn <salyzyn@google.com> Fri Nov 01 15:44:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 15:44:29 2019 -0700
tree 7d680def23fb154d519b4c127d31da89eb5c8bf6
parent 33498df1dc7d4d8cb3e0112882794dd1438f4648
parent 2320f3f90f427557d8c0e60fa175d4be7eb15375

Merge "libmodprobe: add strict bool argument to LoadListedModules" am: 552bbdde38 am: 2592110b39
am: eff0718e37

Change-Id: I53c7776b3e6d0500f9c8cb4a77ed4454577ff4d4

libmodprobe/include/modprobe/modprobe.h

diff --git a/libmodprobe/include/modprobe/modprobe.h b/libmodprobe/include/modprobe/modprobe.h
index 421d826..333fc55 100644
--- a/libmodprobe/include/modprobe/modprobe.h
+++ b/libmodprobe/include/modprobe/modprobe.h
@@ -26,7 +26,7 @@
   public:
     Modprobe(const std::vector<std::string>&);
 
-    bool LoadListedModules();
+    bool LoadListedModules(bool strict = true);
     bool LoadWithAliases(const std::string& module_name, bool strict,
                          const std::string& parameters = "");
     bool Remove(const std::string& module_name);

libmodprobe/libmodprobe.cpp

diff --git a/libmodprobe/libmodprobe.cpp b/libmodprobe/libmodprobe.cpp
index 3c78ec9..6b9107f 100644
--- a/libmodprobe/libmodprobe.cpp
+++ b/libmodprobe/libmodprobe.cpp
@@ -360,13 +360,15 @@
     return true;
 }
 
-bool Modprobe::LoadListedModules() {
+bool Modprobe::LoadListedModules(bool strict) {
+    auto ret = true;
     for (const auto& module : module_load_) {
         if (!LoadWithAliases(module, true)) {
-            return false;
+            ret = false;
+            if (strict) break;
         }
     }
-    return true;
+    return ret;
 }
 
 bool Modprobe::Remove(const std::string& module_name) {