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