diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-04 01:42:49 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-04 01:47:31 +0100 |
| commit | 5e07a79e84ab8b045b9df1a2719f14fc84471a1d (patch) | |
| tree | 39d8e28f093575939ced3e9a86d51672212ffa3b | |
| parent | b9be39bfb4ed8e43a7c445831131e44be998eb32 (diff) | |
core: don't reset log level to NOTICE if we get quiet on the kernel cmdline
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
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/shared/log.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c index 0480bc8d43..0749f0413a 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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; diff --git a/src/shared/log.c b/src/shared/log.c index 9c0156026d..03ef018bd4 100644 --- a/src/shared/log.c +++ b/src/shared/log.c @@ -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) |