|
 |
5509c00 |
From 09fcc5cffa54468595fbf6b81308cd22e896cdfe Mon Sep 17 00:00:00 2001
|
|
|
5509c00 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
5509c00 |
Date: Tue, 17 Jun 2014 01:05:39 +0200
|
|
|
5509c00 |
Subject: [PATCH] log: don't downgrade log level in non-PID 1 if "quiet" is
|
|
|
5509c00 |
passed on kernel cmdline
|
|
|
5509c00 |
|
|
|
5509c00 |
"debug" should apply to all tools, but "quiet" only to PID1.
|
|
|
5509c00 |
|
|
|
5509c00 |
(cherry picked from commit d7b15e0a0161e8fd823bffd61a4799364871582f)
|
|
|
5509c00 |
---
|
|
|
5509c00 |
src/core/main.c | 5 +++++
|
|
|
5509c00 |
src/shared/log.c | 3 ---
|
|
|
5509c00 |
2 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
5509c00 |
|
|
|
5509c00 |
diff --git a/src/core/main.c b/src/core/main.c
|
|
|
5509c00 |
index c9472929..80a2ea3a 100644
|
|
|
5509c00 |
--- a/src/core/main.c
|
|
|
5509c00 |
+++ b/src/core/main.c
|
|
|
5509c00 |
@@ -412,11 +412,16 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
|
|
|
5509c00 |
}
|
|
|
5509c00 |
|
|
|
5509c00 |
} else if (streq(key, "quiet") && !value) {
|
|
|
5509c00 |
+
|
|
|
5509c00 |
+ log_set_max_level(LOG_NOTICE);
|
|
|
5509c00 |
+
|
|
|
5509c00 |
if (arg_show_status == _SHOW_STATUS_UNSET)
|
|
|
5509c00 |
arg_show_status = SHOW_STATUS_AUTO;
|
|
|
5509c00 |
|
|
|
5509c00 |
} else if (streq(key, "debug") && !value) {
|
|
|
5509c00 |
+
|
|
|
5509c00 |
log_set_max_level(LOG_DEBUG);
|
|
|
5509c00 |
+
|
|
|
5509c00 |
if (detect_container(NULL) > 0)
|
|
|
5509c00 |
log_set_target(LOG_TARGET_CONSOLE);
|
|
|
5509c00 |
|
|
|
5509c00 |
diff --git a/src/shared/log.c b/src/shared/log.c
|
|
|
5509c00 |
index 6f17705a..9039db34 100644
|
|
|
5509c00 |
--- a/src/shared/log.c
|
|
|
5509c00 |
+++ b/src/shared/log.c
|
|
|
5509c00 |
@@ -878,9 +878,6 @@ void log_parse_environment(void) {
|
|
|
5509c00 |
if (l == 5 && startswith(w, "debug")) {
|
|
|
5509c00 |
log_set_max_level(LOG_DEBUG);
|
|
|
5509c00 |
break;
|
|
|
5509c00 |
- } else if (l == 5 && startswith(w, "quiet")) {
|
|
|
5509c00 |
- log_set_max_level(LOG_WARNING);
|
|
|
5509c00 |
- break;
|
|
|
5509c00 |
}
|
|
|
5509c00 |
}
|
|
|
5509c00 |
}
|