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
diff --git a/toolbox/modprobe.cpp b/toolbox/modprobe.cpp
index 13026ac..fa6297d 100644
--- a/toolbox/modprobe.cpp
+++ b/toolbox/modprobe.cpp
@@ -52,7 +52,7 @@
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 @@
/* 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 @@
mode = RemoveModulesMode;
break;
case 's':
- syslog = true;
break;
case 'v':
if (android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {