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

Commit 441f3923 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 0b2f24ce 64776335
Loading
Loading
Loading
Loading
+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, " ");