diff options
| author | Gary Ching-Pang Lin <glin@suse.com> | 2013-04-30 09:46:23 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-04-30 09:46:23 -0400 |
| commit | 39baf6dff76ac3ab16d8831144a382f1ea6e9085 (patch) | |
| tree | bd80c09af4b33d00531130719a63b0b59d1c12ea /fallback.c | |
| parent | 117b1214d84392675f537ddfc126cd6e3d41facf (diff) | |
| download | efi-boot-shim-39baf6dff76ac3ab16d8831144a382f1ea6e9085.tar.gz efi-boot-shim-39baf6dff76ac3ab16d8831144a382f1ea6e9085.zip | |
Don't update BootOrder until all csv files are processed
Diffstat (limited to 'fallback.c')
| -rw-r--r-- | fallback.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -475,8 +475,6 @@ find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname) } while (bs != 0); rc = EFI_SUCCESS; - if (nbootorder > 0) - rc = update_boot_order(); return rc; } @@ -587,9 +585,12 @@ find_boot_options(EFI_HANDLE device) } while (1); + if (rc == EFI_SUCCESS && nbootorder > 0) + rc = update_boot_order(); + uefi_call_wrapper(fh2->Close, 1, fh2); uefi_call_wrapper(fh->Close, 1, fh); - return EFI_SUCCESS; + return rc; } EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *systab) |