diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-17 01:05:39 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-17 02:43:44 +0200 |
| commit | d7b15e0a0161e8fd823bffd61a4799364871582f (patch) | |
| tree | 3d5e7a18235546560bb78f3e55fddcdd1d3870ea | |
| parent | 8f294b45cbb627d31342f6a79444be59ce7e2274 (diff) | |
log: don't downgrade log level in non-PID 1 if "quiet" is passed on kernel cmdline
"debug" should apply to all tools, but "quiet" only to PID1.
| -rw-r--r-- | src/core/main.c | 5 | ||||
| -rw-r--r-- | src/shared/log.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c index 3e57f07c42..4ad3bc2c57 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -412,11 +412,16 @@ static int parse_proc_cmdline_item(const char *key, const char *value) { } } else if (streq(key, "quiet") && !value) { + + log_set_max_level(LOG_NOTICE); + if (arg_show_status == _SHOW_STATUS_UNSET) arg_show_status = SHOW_STATUS_AUTO; } else if (streq(key, "debug") && !value) { + log_set_max_level(LOG_DEBUG); + if (detect_container(NULL) > 0) log_set_target(LOG_TARGET_CONSOLE); diff --git a/src/shared/log.c b/src/shared/log.c index 6f17705abf..9039db3496 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -878,9 +878,6 @@ void log_parse_environment(void) { if (l == 5 && startswith(w, "debug")) { log_set_max_level(LOG_DEBUG); break; - } else if (l == 5 && startswith(w, "quiet")) { - log_set_max_level(LOG_WARNING); - break; } } } |