diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-01-28 15:42:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 15:42:10 +0100 |
| commit | 8615bec7a075e7790af98cbd04cefa7fcd816909 (patch) | |
| tree | 8e6f60c92553f39eb8fa77315a2af56150ca58da /src | |
| parent | 1b3cccfdacc7b36d2a541d944a6268cacfe2fcf2 (diff) | |
| parent | fe5a698f7646735335a97cc429ebe5d79f67fb70 (diff) | |
| download | systemd-8615bec7a075e7790af98cbd04cefa7fcd816909.tar.gz | |
Merge pull request #14667 from yuwata/boot-random-seed-mode
boot: parse random-seed-mode
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/efi/boot.c | 4 | ||||
| -rw-r--r-- | src/shared/bootspec.c | 3 | ||||
| -rw-r--r-- | src/shared/bootspec.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index e1a1a68527..18304138e7 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -404,10 +404,10 @@ static VOID print_status(Config *config, CHAR16 *loaded_image_path) { Print(L"random-seed-mode: off\n"); break; case RANDOM_SEED_WITH_SYSTEM_TOKEN: - Print(L"random-seed-node: with-system-token\n"); + Print(L"random-seed-mode: with-system-token\n"); break; case RANDOM_SEED_ALWAYS: - Print(L"random-seed-node: always\n"); + Print(L"random-seed-mode: always\n"); break; default: ; diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c index 699b101b39..13d7b2f160 100644 --- a/src/shared/bootspec.c +++ b/src/shared/bootspec.c @@ -164,6 +164,7 @@ void boot_config_free(BootConfig *config) { free(config->auto_entries); free(config->auto_firmware); free(config->console_mode); + free(config->random_seed_mode); free(config->entry_oneshot); free(config->entry_default); @@ -229,6 +230,8 @@ static int boot_loader_read_conf(const char *path, BootConfig *config) { 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")) + r = free_and_strdup(&config->random_seed_mode, p); else { log_notice("%s:%u: Unknown line \"%s\", ignoring.", path, line, field); continue; diff --git a/src/shared/bootspec.h b/src/shared/bootspec.h index a825b35bc5..b40680b643 100644 --- a/src/shared/bootspec.h +++ b/src/shared/bootspec.h @@ -43,6 +43,7 @@ typedef struct BootConfig { char *auto_entries; char *auto_firmware; char *console_mode; + char *random_seed_mode; char *entry_oneshot; char *entry_default; |