summaryrefslogtreecommitdiff
path: root/fallback.c
diff options
context:
space:
mode:
authorGary Ching-Pang Lin <glin@suse.com>2013-04-30 17:04:16 +0800
committerPeter Jones <pjones@redhat.com>2013-04-30 09:46:23 -0400
commit8adfd201feabdc463e37f3b5db387ddcf2cd441f (patch)
treebd80c09af4b33d00531130719a63b0b59d1c12ea /fallback.c
parentf7fbcdce367aff2d338ea2294996284a4af078d0 (diff)
downloadefi-boot-shim-8adfd201feabdc463e37f3b5db387ddcf2cd441f.tar.gz
efi-boot-shim-8adfd201feabdc463e37f3b5db387ddcf2cd441f.zip
Don't update BootOrder until all csv files are processed
Diffstat (limited to 'fallback.c')
-rw-r--r--fallback.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fallback.c b/fallback.c
index 6cc59aa6..d3179b6c 100644
--- a/fallback.c
+++ b/fallback.c
@@ -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)