From 9a75c652488bfe425958e367a15bc1dd8d1bd82c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 12 Jul 2019 10:41:28 +0200 Subject: [PATCH] shutdown: bump kmsg log level to LOG_WARNING only Fixes: #12337 --- src/shutdown/shutdown.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 3c6aed1121..45f3461547 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -344,15 +344,17 @@ int main(int argc, char *argv[]) { (void) cg_get_root_path(&cgroup); in_container = detect_container() > 0; - /* If the logging messages are going to KMSG, and if we are not running from a container, - * then try to update the sysctl kernel.printk current value in order to see "info" messages; - * This current log level is not updated if already big enough. + /* If the logging messages are going to KMSG, and if we are not running from a container, then try to + * update the sysctl kernel.printk current value in order to see "info" messages; This current log + * level is not updated if already big enough. */ - if (!in_container && IN_SET(log_get_target(), LOG_TARGET_AUTO, - LOG_TARGET_JOURNAL_OR_KMSG, - LOG_TARGET_SYSLOG_OR_KMSG, - LOG_TARGET_KMSG)) - bump_sysctl_printk_log_level(LOG_INFO); + if (!in_container && + IN_SET(log_get_target(), + LOG_TARGET_AUTO, + LOG_TARGET_JOURNAL_OR_KMSG, + LOG_TARGET_SYSLOG_OR_KMSG, + LOG_TARGET_KMSG)) + bump_sysctl_printk_log_level(LOG_WARNING); use_watchdog = getenv("WATCHDOG_USEC"); watchdog_device = getenv("WATCHDOG_DEVICE");