kernel loader: don't try to reload modules already loaded by init
Change-Id: I58fb2ee369bdb9f5c5f9e6c8ea3f15781ae60ece
diff --git a/kernel_module_loader.hpp b/kernel_module_loader.hpp
index 0115ce4..de28bd2 100644
--- a/kernel_module_loader.hpp
+++ b/kernel_module_loader.hpp
@@ -6,6 +6,7 @@
#include <vector>
#include <android-base/strings.h>
#include <modprobe/modprobe.h>
+#include <sys/mount.h>
#include <sys/utsname.h>
#include "twcommon.h"
@@ -22,12 +23,13 @@
class KernelModuleLoader
{
public:
- static bool Load_Vendor_Modules(BOOT_MODE mode); // Load specific maintainer defined kernel modules in TWRP
+ static bool Load_Vendor_Modules(); // Load specific maintainer defined kernel modules in TWRP
private:
- static int Try_And_Load_Modules(std::string module_dir); // Use libmodprobe to attempt loading kernel modules
+ static int Try_And_Load_Modules(std::string module_dir, bool vendor_is_mounted); // Use libmodprobe to attempt loading kernel modules
static bool Write_Module_List(std::string module_dir); // Write list of modules to load from TW_LOAD_VENDOR_MODULES
static bool Copy_Modules_To_Tmpfs(std::string module_dir); // Copy modules to ramdisk for loading
+ static std::vector<string> Skip_Loaded_Kernel_Modules(); // return list of loaded kernel modules already done by init
};
#endif // _KERNELMODULELOADER_HPP
\ No newline at end of file