shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-09 01:18:19 +03:00
Code

log: don't downgrade log level in non-PID 1 if "quiet" is passed on kernel cmdline

Browse Source 
"debug" should apply to all tools, but "quiet" only to PID1.
This commit is contained in:
Lennart Poettering 2014-06-17 01:05:39 +02:00
parent 8f294b45cb
commit d7b15e0a01
Notes: Zbigniew Jędrzejewski-Szmek 2014-06-21 10:24:36 -04:00 
Backport: fix
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/main.c
View File

@ -412,11 +412,16 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
} }
} else if (streq(key, "quiet") && !value) { } else if (streq(key, "quiet") && !value) {
log_set_max_level(LOG_NOTICE);
if (arg_show_status == _SHOW_STATUS_UNSET) if (arg_show_status == _SHOW_STATUS_UNSET)
arg_show_status = SHOW_STATUS_AUTO; arg_show_status = SHOW_STATUS_AUTO;
} else if (streq(key, "debug") && !value) { } else if (streq(key, "debug") && !value) {
log_set_max_level(LOG_DEBUG); log_set_max_level(LOG_DEBUG);
if (detect_container(NULL) > 0) if (detect_container(NULL) > 0)
log_set_target(LOG_TARGET_CONSOLE); log_set_target(LOG_TARGET_CONSOLE);

3
src/shared/log.c
View File

@ -878,9 +878,6 @@ void log_parse_environment(void) {
if (l == 5 && startswith(w, "debug")) { if (l == 5 && startswith(w, "debug")) {
log_set_max_level(LOG_DEBUG); log_set_max_level(LOG_DEBUG);
break; break;
} else if (l == 5 && startswith(w, "quiet")) {
log_set_max_level(LOG_WARNING);
break;
} }
} }
} }