Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main
This commit is contained in:
commit
441f39230e
1 changed files with 4 additions and 2 deletions
|
@ -245,8 +245,10 @@ extern "C" int modprobe_main(int argc, char** argv) {
|
|||
}
|
||||
free(kernel_dirs);
|
||||
|
||||
// Allow modules to be directly inside /lib/modules
|
||||
mod_dirs.emplace_back(LIB_MODULES_PREFIX);
|
||||
if (mod_dirs.empty() || getpagesize() == 4096) {
|
||||
// Allow modules to be directly inside /lib/modules
|
||||
mod_dirs.emplace_back(LIB_MODULES_PREFIX);
|
||||
}
|
||||
}
|
||||
|
||||
LOG(DEBUG) << "mode is " << mode;
|
||||
|
|
Loading…
Reference in a new issue