shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-02 09:47:03 +03:00
Code

sd-boot: Fix marking EFI var default entry

Browse Source 
Fixes: #18072
This commit is contained in:
Jan Janssen 2021-08-14 13:44:12 +02:00
parent 64bb56e58b
commit 54af753f3a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/boot/efi/boot.c
View File

@ -1425,6 +1425,7 @@ static VOID config_load_defaults(Config *config, EFI_FILE *root_dir) {
.auto_entries = TRUE, .auto_entries = TRUE,
.auto_firmware = TRUE, .auto_firmware = TRUE,
.random_seed_mode = RANDOM_SEED_WITH_SYSTEM_TOKEN, .random_seed_mode = RANDOM_SEED_WITH_SYSTEM_TOKEN,
.idx_default_efivar = -1,
}; };
err = file_read(root_dir, L"\\loader\\loader.conf", 0, 0, &content, NULL); err = file_read(root_dir, L"\\loader\\loader.conf", 0, 0, &content, NULL);
@ -1564,7 +1565,7 @@ static INTN config_entry_find(Config *config, CHAR16 *id) {
} }
static VOID config_default_entry_select(Config *config) { static VOID config_default_entry_select(Config *config) {
_cleanup_freepool_ CHAR16 *entry_oneshot = NULL, *entry_default = NULL; _cleanup_freepool_ CHAR16 *entry_default = NULL;
EFI_STATUS err; EFI_STATUS err;
INTN i; INTN i;
@ -1574,13 +1575,11 @@ static VOID config_default_entry_select(Config *config) {
* The EFI variable to specify a boot entry for the next, and only the * The EFI variable to specify a boot entry for the next, and only the
* next reboot. The variable is always cleared directly after it is read. * next reboot. The variable is always cleared directly after it is read.
*/ */
err = efivar_get(LOADER_GUID, L"LoaderEntryOneShot", &entry_oneshot); err = efivar_get(LOADER_GUID, L"LoaderEntryOneShot", &config->entry_oneshot);
if (!EFI_ERROR(err)) { if (!EFI_ERROR(err)) {
config->entry_oneshot = StrDuplicate(entry_oneshot);
efivar_set(LOADER_GUID, L"LoaderEntryOneShot", NULL, EFI_VARIABLE_NON_VOLATILE); efivar_set(LOADER_GUID, L"LoaderEntryOneShot", NULL, EFI_VARIABLE_NON_VOLATILE);
i = config_entry_find(config, entry_oneshot); i = config_entry_find(config, config->entry_oneshot);
if (i >= 0) { if (i >= 0) {
config->idx_default = i; config->idx_default = i;
return; return;
@ -1594,7 +1593,6 @@ static VOID config_default_entry_select(Config *config) {
*/ */
err = efivar_get(LOADER_GUID, L"LoaderEntryDefault", &entry_default); err = efivar_get(LOADER_GUID, L"LoaderEntryDefault", &entry_default);
if (!EFI_ERROR(err)) { if (!EFI_ERROR(err)) {
i = config_entry_find(config, entry_default); i = config_entry_find(config, entry_default);
if (i >= 0) { if (i >= 0) {
config->idx_default = i; config->idx_default = i;
@ -1602,7 +1600,6 @@ static VOID config_default_entry_select(Config *config) {
return; return;
} }
} }
config->idx_default_efivar = -1;
if (config->entry_count == 0) if (config->entry_count == 0)
return; return;