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

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

Merge changes I68f7d46b,I5d5278ab into main am: 0c230124 

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



Change-Id: Ie3e9c1f0c980e26feddf0cc65e20d80d9357bbb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4595c8f5 0c230124

libmodprobe/include/modprobe/modprobe.h

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ class Modprobe { 
                            std::vector<std::string>* post_dependencies);

    void ResetModuleCount() { module_count_ = 0; }

    int GetModuleCount() { return module_count_; }

    bool IsBlocklisted(const std::string& module_name);



  private:

    std::string MakeCanonical(const std::string& module_path);
@@ -52,7 +53,6 @@ class Modprobe { 
    void AddOption(const std::string& module_name, const std::string& option_name,

                   const std::string& value);

    std::string GetKernelCmdline();

    bool IsBlocklisted(const std::string& module_name);



    bool ParseDepCallback(const std::string& base_path, const std::vector<std::string>& args);

    bool ParseAliasCallback(const std::vector<std::string>& args);

toolbox/modprobe.cpp

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ extern "C" int modprobe_main(int argc, char** argv) { 
        switch (mode) {

            case AddModulesMode:

                if (!m.LoadWithAliases(module, true, module_parameters)) {

                    if (m.IsBlocklisted(module)) continue;

                    PLOG(ERROR) << "Failed to load module " << module;

                    rv = EXIT_FAILURE;

                }