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

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

Merge "Improve error message of libmodprobe" am: 38b572c9 am: 1754acc7 

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



Change-Id: I31a830503d1f882f3f6a974aaf7d0a6e66884570
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2242cba 1754acc7

libmodprobe/libmodprobe.cpp

+3 −2
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ void Modprobe::ParseCfg(const std::string& cfg, 
    }



    std::vector<std::string> lines = android::base::Split(cfg_contents, "\n");

    for (const std::string line : lines) {

    for (const auto& line : lines) {

        if (line.empty() || line[0] == '#') {

            continue;

        }
@@ -421,7 +421,8 @@ bool Modprobe::LoadWithAliases(const std::string& module_name, bool strict, 
    }



    if (strict && !module_loaded) {

        LOG(ERROR) << "LoadWithAliases was unable to load " << module_name;

        LOG(ERROR) << "LoadWithAliases was unable to load " << module_name

                   << ", tried: " << android::base::Join(modules_to_load, ", ");

        return false;

    }

    return true;

libmodprobe/libmodprobe_ext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ bool Modprobe::Rmmod(const std::string& module_name) { 
}



bool Modprobe::ModuleExists(const std::string& module_name) {

    struct stat fileStat;

    struct stat fileStat {};

    if (blocklist_enabled && module_blocklist_.count(module_name)) {

        LOG(INFO) << "module " << module_name << " is blocklisted";

        return false;
@@ -95,7 +95,7 @@ bool Modprobe::ModuleExists(const std::string& module_name) { 
        return false;

    }

    if (stat(deps.front().c_str(), &fileStat)) {

        LOG(INFO) << "module " << module_name << " does not exist";

        PLOG(INFO) << "module " << module_name << " can't be loaded; can't access " << deps.front();

        return false;

    }

    if (!S_ISREG(fileStat.st_mode)) {