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

Commit 97f18afa authored by Yi-Yo Chiang's avatar Yi-Yo Chiang
Browse files

modprobe: Always log failures to the kernel logger 

Failure to load modules are often critical, so made more sense to always
log such failures to the kernel logger and system logger.

Bug: 383081955
Test: Presubmit
Change-Id: Ie154d9dfef0e20d3df56f3034d465aa8c797ed5b
parent 3aed5fd2

toolbox/modprobe.cpp

+2 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void print_usage(void) { 
    LOG(INFO) << "  -h, --help: Print this help";

    LOG(INFO) << "  -l, --list: List modules matching pattern";

    LOG(INFO) << "  -r, --remove: Remove MODULE (multiple modules may be specified)";

    LOG(INFO) << "  -s, --syslog: print to syslog also";

    LOG(INFO) << "  -s, --syslog: print to syslog also (deprecated)";

    LOG(INFO) << "  -q, --quiet: disable messages";

    LOG(INFO) << "  -v, --verbose: enable more messages, even more with a second -v";

    LOG(INFO);
@@ -76,12 +76,10 @@ std::string stripComments(const std::string& str) { 
    /* NOTREACHED */

}



auto syslog = false;



void MyLogger(android::base::LogId id, android::base::LogSeverity severity, const char* tag,

              const char* file, unsigned int line, const char* message) {

    android::base::StdioLogger(id, severity, tag, file, line, message);

    if (syslog && message[0]) {

    if (message[0]) {

        android::base::KernelLogger(id, severity, tag, file, line, message);

    }

}
@@ -200,7 +198,6 @@ extern "C" int modprobe_main(int argc, char** argv) { 
                mode = RemoveModulesMode;

                break;

            case 's':

                syslog = true;

                break;

            case 'v':

                if (android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {