62 lines
2.0 KiB
Diff
62 lines
2.0 KiB
Diff
|
From 9a209af5d84f4015ec399e1d1fa9dab31ef4d2b7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Frauendorfer | Miray Software <tf@miray.de>
|
||
|
|
Date: Wed, 25 Mar 2020 09:19:19 +0100
|
||
|
|
Subject: [PATCH 49/62] Check PxeReplyReceived as fallback in netboot
|
||
|
|
|
||
|
|
Some mainboards do not update the ProxyOffset dhcp information when using
|
||
|
|
proxy dhcp and boot menus.
|
||
|
|
This adds a fallback to check the PxeReply field if no boot information is
|
||
|
|
found in the v4 dhcp or proxy dhcp information
|
||
|
|
|
||
|
|
Upstream-commit-id: cc7ebe0f9f4
|
||
|
|
---
|
||
|
|
netboot.c | 15 ++++++++++++---
|
||
|
|
1 file changed, 12 insertions(+), 3 deletions(-)
|
||
|
|
mode change 100644 => 100755 netboot.c
|
||
|
|
|
||
|
|
diff --git a/netboot.c b/netboot.c
|
||
|
|
old mode 100644
|
||
|
|
new mode 100755
|
||
|
|
index 4922ef284b1..047dad3a760
|
||
|
|
--- a/netboot.c
|
||
|
|
+++ b/netboot.c
|
||
|
|
@@ -273,7 +273,16 @@ static EFI_STATUS parseDhcp4()
|
||
|
|
pkt_v4 = &pxe->Mode->ProxyOffer.Dhcpv4;
|
||
|
|
}
|
||
|
|
|
||
|
|
- INTN dir_len = strnlena(pkt_v4->BootpBootFile, 127);
|
||
|
|
+ if(pxe->Mode->PxeReplyReceived) {
|
||
|
|
+ /*
|
||
|
|
+ * If we have no bootinfo yet search for it in the PxeReply.
|
||
|
|
+ * Some mainboards run into this when the server uses boot menus
|
||
|
|
+ */
|
||
|
|
+ if(pkt_v4->BootpBootFile[0] == '\0' && pxe->Mode->PxeReply.Dhcpv4.BootpBootFile[0] != '\0')
|
||
|
|
+ pkt_v4 = &pxe->Mode->PxeReply.Dhcpv4;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ INTN dir_len = strnlena((CHAR8 *)pkt_v4->BootpBootFile, 127);
|
||
|
|
INTN i;
|
||
|
|
UINT8 *dir = pkt_v4->BootpBootFile;
|
||
|
|
|
||
|
|
@@ -289,7 +298,7 @@ static EFI_STATUS parseDhcp4()
|
||
|
|
return EFI_OUT_OF_RESOURCES;
|
||
|
|
|
||
|
|
if (dir_len > 0) {
|
||
|
|
- strncpya(full_path, dir, dir_len);
|
||
|
|
+ strncpya(full_path, (CHAR8 *)dir, dir_len);
|
||
|
|
if (full_path[dir_len-1] == '/' && template[0] == '/')
|
||
|
|
full_path[dir_len-1] = '\0';
|
||
|
|
}
|
||
|
|
@@ -340,7 +349,7 @@ EFI_STATUS FetchNetbootimage(EFI_HANDLE image_handle, VOID **buffer, UINT64 *buf
|
||
|
|
|
||
|
|
try_again:
|
||
|
|
efi_status = pxe->Mtftp(pxe, read, *buffer, overwrite, bufsiz, &blksz,
|
||
|
|
- &tftp_addr, full_path, NULL, nobuffer);
|
||
|
|
+ &tftp_addr, (UINT8 *)full_path, NULL, nobuffer);
|
||
|
|
if (efi_status == EFI_BUFFER_TOO_SMALL) {
|
||
|
|
/* try again, doubling buf size */
|
||
|
|
*bufsiz *= 2;
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|