Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a1b984 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "toolbox/modprobe: Load modules from /lib/modules based on page size"... 

Merge "toolbox/modprobe: Load modules from /lib/modules based on page size" into main am: 441f3923

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3124933



Change-Id: I6a19514aa824ef775f03576a63b39790bca74451
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59e49972 441f3923

toolbox/modprobe.cpp

+4 −2
Original line number Diff line number Diff line
@@ -245,9 +245,11 @@ extern "C" int modprobe_main(int argc, char** argv) { 
        }

        free(kernel_dirs);



        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;

    LOG(DEBUG) << "mod_dirs is: " << android::base::Join(mod_dirs, " ");