From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 26 Jun 2025 08:59:10 +0000 (+0200)
Subject: boot: downgrade log messages about invalid timeouts
X-Git-Tag: v258-rc1~247
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76a71fb64d6b62be90e35aeca2ee19baeb2d813c;p=thirdparty%2Fsystemd.git

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

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