From b96df6fa092450224e3b0ca1619df0281a2c2d3b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 26 Feb 2024 12:21:01 +0100 Subject: [PATCH] bootspec: don't complain about valid loader.conf settings Let's not complain about various valid loader.conf settings we more recently added. At the same time let's remove the half-assed userspace parsers for the fields we actually do support but don't actually really care about in userspace. There's really no point in storing strings away that we are not using at all, hence just don#t. Fixes: #31487 --- src/shared/bootspec.c | 24 ++++-------------------- src/shared/bootspec.h | 6 ------ 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index df45c670007..ceda70fb879 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -431,12 +431,6 @@ void boot_config_free(BootConfig *config) { assert(config); free(config->default_pattern); - free(config->timeout); - free(config->editor); - free(config->auto_entries); - free(config->auto_firmware); - free(config->console_mode); - free(config->beep); free(config->entry_oneshot); free(config->entry_default); @@ -491,20 +485,10 @@ int boot_loader_read_conf(BootConfig *config, FILE *file, const char *path) { if (streq(field, "default")) r = free_and_strdup(&config->default_pattern, p); - else if (streq(field, "timeout")) - r = free_and_strdup(&config->timeout, p); - else if (streq(field, "editor")) - r = free_and_strdup(&config->editor, p); - else if (streq(field, "auto-entries")) - r = free_and_strdup(&config->auto_entries, p); - else if (streq(field, "auto-firmware")) - r = free_and_strdup(&config->auto_firmware, p); - else if (streq(field, "console-mode")) - r = free_and_strdup(&config->console_mode, p); - else if (streq(field, "random-seed-mode")) - log_syntax(NULL, LOG_WARNING, path, line, 0, "'random-seed-mode' has been deprecated, ignoring."); - else if (streq(field, "beep")) - r = free_and_strdup(&config->beep, p); + else if (STR_IN_SET(field, "timeout", "editor", "auto-entries", "auto-firmware", + "auto-poweroff", "auto-reboot", "beep", "reboot-for-bitlocker", + "secure-boot-enroll", "console-mode")) + 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); continue; diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h index 9ae88d78aae..5f9a0d70562 100644 --- a/src/shared/bootspec.h +++ b/src/shared/bootspec.h @@ -65,12 +65,6 @@ typedef struct BootEntry { typedef struct BootConfig { char *default_pattern; - char *timeout; - char *editor; - char *auto_entries; - char *auto_firmware; - char *console_mode; - char *beep; char *entry_oneshot; char *entry_default; -- 2.47.3