shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

core: don't reset log level to NOTICE if we get quiet on the kernel cmdline

Browse Source 
quiet should really just have an effect on the stuff we dump on the
console, not what we log elsewhere.

Hence:

        debug on kernel cmdline → interpreted by every tool, turns up
        log levels to "debug" everywhere.

        quiet on kernel cmdline → interpreted only by PID 1 (and
        obviously the kernel) no alteration of the max log level, but
        turns off status output.

http://lists.freedesktop.org/archives/systemd-devel/2014-December/026271.html
This commit is contained in:
Lennart Poettering 2015-02-04 01:42:49 +01:00
parent b9be39bfb4
commit 5e07a79e84
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View File

@ -367,8 +367,6 @@ 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;

4
src/shared/log.c
View File

@ -914,7 +914,9 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
* The systemd.log_xyz= settings are parsed by all tools, and
* so is "debug".
*
* However, "quiet" is only parsed by PID 1!
* However, "quiet" is only parsed by PID 1, and only turns of
* status output to /dev/console, but does not alter the log
* level.
*/
if (streq(key, "debug") && !value)