From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Feb 2015 00:42:49 +0000 (+0100)
Subject: core: don't reset log level to NOTICE if we get quiet on the kernel cmdline
X-Git-Tag: v219~156
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5e07a79e84ab8b045b9df1a2719f14fc84471a1d

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
---

diff --git a/src/core/main.c b/src/core/main.c
index 0480bc8d4..0749f0413 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 9c0156026..03ef018bd 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)