clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-06 05:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

(cherry picked from commit d7b15e0a01)
This commit is contained in:
Lennart Poettering
2014-06-22 22:47:02 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent c88a943a73
commit 09fcc5cffa
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/main.c
+5
View File
@@ -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);
src/shared/log.c
-3
View File
@@ -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;
}
}
}