morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

shared/bootspec: update valid loader.conf options

Browse Source
This commit is contained in:
Felix Pehla
2025-09-29 23:06:16 +02:00
parent aaa3e6880d
commit 0b89d8cfec
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/boot/boot.c
View File

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

2
src/shared/bootspec.c
View File

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