summaryrefslogtreecommitdiff
path: root/fallback.c
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2015-11-02 10:54:11 -0500
committerPeter Jones <pjones@redhat.com>2016-09-06 14:39:15 -0400
commit6f0409206055bff882cc18348353aad63d2d8247 (patch)
treea2eaf61e8cf2c7df1fce9b5c6fd0ad9e49431ef9 /fallback.c
parent14a59055aa85e3e91b12a8ff53cf3216b8977e65 (diff)
downloadefi-boot-shim-6f0409206055bff882cc18348353aad63d2d8247.tar.gz
efi-boot-shim-6f0409206055bff882cc18348353aad63d2d8247.zip
Make fallback and mokmanager know about multi-arch.
On baytrail, we've got 32-bit firmware, 32-bit efi utilities, and 64-bit kernel. So since most distros will want 32+64 EFI media booting a 64-bit kernel, we have to name them better on the filesystem. Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'fallback.c')
-rw-r--r--fallback.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fallback.c b/fallback.c
index da7f2099..6c9774d0 100644
--- a/fallback.c
+++ b/fallback.c
@@ -608,7 +608,8 @@ find_boot_csv(EFI_FILE_HANDLE fh, CHAR16 *dirname)
fi = buffer;
- if (!StrCaseCmp(fi->FileName, L"boot.csv")) {
+ if (!StrCaseCmp(fi->FileName, L"boot.csv")
+ || !StrCaseCmp(fi->FileName, L"boot" EFI_ARCH L".csv")) {
EFI_FILE_HANDLE fh2;
rc = uefi_call_wrapper(fh->Open, 5, fh, &fh2,
fi->FileName,
@@ -817,7 +818,7 @@ debug_hook(void)
x = 1;
Print(L"add-symbol-file "DEBUGDIR
- L"fallback.debug %p -s .data %p\n", &_etext,
+ L"fb" EFI_ARCH L".efi.debug %p -s .data %p\n", &_etext,
&_edata);
}