From: Felix Pehla <29adc1fd92@gmail.com>
Date: Mon, 29 Sep 2025 21:06:16 +0000 (+0200)
Subject: shared/bootspec: update valid loader.conf options
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F39165%2Fhead;p=thirdparty%2Fsystemd.git

shared/bootspec: update valid loader.conf options
---

diff --git a/src/boot/boot.c b/src/boot/boot.c
index 69c3927e667..3632f005c16 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -1013,6 +1013,8 @@ static void config_defaults_load_from_file(Config *config, char *content) {
         assert(config);
         assert(content);
 
+        /* If you add, remove, or change an option name here, please also update
+         * shared/bootspec.c@boot_loader_read_conf() to make parsing by bootctl/logind/etc. work. */
         while ((line = line_get_key_value(content, " \t", &pos, &key, &value)))
                 if (streq8(key, "timeout")) {
                         if (streq8(value, "menu-disabled"))
@@ -1291,6 +1293,8 @@ static void boot_entry_add_type1(
                 .call = call_image_start,
         };
 
+        /* If you add, remove, or change an option name here, please also update shared/bootspec.c and
+         * shared/varlink-io.systemd.BootControl to make parsing by bootctl/logind/etc. work. */
         while ((line = line_get_key_value(content, " \t", &pos, &key, &value)))
                 if (streq8(key, "title")) {
                         free(entry->title);
@@ -1299,6 +1303,7 @@ static void boot_entry_add_type1(
                 } else if (streq8(key, "sort-key")) {
                         free(entry->sort_key);
                         entry->sort_key = xstr8_to_16(value);
+
                 } else if (streq8(key, "profile")) {
                         uint64_t u;
                         if (parse_number8(value, &u, NULL) && u <= UINT_MAX)
diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 7bae3b00757..28baab98161 100644
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -517,7 +517,7 @@ int boot_loader_read_conf(BootConfig *config, FILE *file, const char *path) {
                 else if (STR_IN_SET(field, "timeout", "editor", "auto-entries", "auto-firmware",
                                     "auto-poweroff", "auto-reboot", "beep", "reboot-for-bitlocker",
                                     "reboot-on-error", "secure-boot-enroll", "secure-boot-enroll-action",
-                                    "console-mode"))
+                                    "secure-boot-enroll-timeout-sec", "console-mode", "log-level"))
                         r = 0; /* we don't parse these in userspace, but they are OK */
                 else {
                         log_syntax(NULL, LOG_WARNING, path, line, 0, "Unknown line '%s', ignoring.", field);