commit d478271b2b793856eb098a0c580d44f02efc4837
author Mark Salyzyn <salyzyn@google.com> Tue Oct 29 09:32:09 2019 -0700
committer Mark Salyzyn <salyzyn@google.com> Thu Oct 31 10:30:35 2019 -0700
tree 652ee8561148335dda1a77a9d5ac8c2549127ff5
parent 46452100977f66956175793a9557b0263bb58e0b

libmodprobe: add strict bool argument to LoadListedModules

Continue loading remaining modules after error if strict flag false.

Test: libmodprobe_test
Bug: 141311820
Change-Id: Ib21d4eade1254b16621e7bf2c9efaa173092e7c7

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) {