From 76a71fb64d6b62be90e35aeca2ee19baeb2d813c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 26 Jun 2025 10:59:10 +0200 Subject: [PATCH] boot: downgrade log messages about invalid timeouts We correctly handle invalid timeouts being stored in EFI variables, but because we deal with this gracefully we should downgrade the log level to warning, and say "ignoring" in the log message. Inspired by #34084 --- src/boot/boot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot/boot.c b/src/boot/boot.c index d1a3850f4af..b765b7f32df 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -1479,7 +1479,7 @@ static void config_load_defaults(Config *config, EFI_FILE *root_dir) { if (err == EFI_SUCCESS) config->timeout_sec = config->timeout_sec_efivar; else if (err != EFI_NOT_FOUND) - log_error_status(err, "Error reading LoaderConfigTimeout EFI variable: %m"); + log_warning_status(err, "Error reading LoaderConfigTimeout EFI variable, ignoring: %m"); err = efivar_get_timeout(u"LoaderConfigTimeoutOneShot", &config->timeout_sec); if (err == EFI_SUCCESS) { @@ -1488,7 +1488,7 @@ static void config_load_defaults(Config *config, EFI_FILE *root_dir) { config->force_menu = true; /* force the menu when this is set */ } else if (err != EFI_NOT_FOUND) - log_error_status(err, "Error reading LoaderConfigTimeoutOneShot EFI variable: %m"); + log_warning_status(err, "Error reading LoaderConfigTimeoutOneShot EFI variable, ignoring: %m"); uint64_t value; err = efivar_get_uint64_str16(MAKE_GUID_PTR(LOADER), u"LoaderConfigConsoleMode", &value); -- 2.47.3