Revert "modprobe: Always log failures to the kernel logger"
This reverts commit 97f18afaf1a630f71609bb65b9ae424c3f6910c4.
Reason for revert: Likely culprit for b/388717752 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I8eac70278e969063082be62a6ecf057df7b9581e
diff --git a/toolbox/modprobe.cpp b/toolbox/modprobe.cpp
index fa6297d..13026ac 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 (deprecated)";
+ LOG(INFO) << " -s, --syslog: print to syslog also";
LOG(INFO) << " -q, --quiet: disable messages";
LOG(INFO) << " -v, --verbose: enable more messages, even more with a second -v";
LOG(INFO);
@@ -76,10 +76,12 @@
/* 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 (message[0]) {
+ if (syslog && message[0]) {
android::base::KernelLogger(id, severity, tag, file, line, message);
}
}
@@ -198,6 +200,7 @@
mode = RemoveModulesMode;
break;
case 's':
+ syslog = true;
break;
case 'v':
if (android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {