From aa61755ec0c079ce801724a2c40b69deaa46822b Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@me.com>
Date: Wed, 9 Nov 2016 12:26:44 +0200
Subject: 7567 Netboot: allow both tftpfs and nfs in both pxeboot and
 loader.efi Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Adam
 Števko <adam.stevko@gmail.com> Approved by: Dan McDonald <danmcd@omniti.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 usr/src/boot/lib/libstand/bootp.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'usr/src/boot/lib/libstand/bootp.c')

diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/lib/libstand/bootp.c
index 7f9e62e76e..626ff8c952 100644
--- a/usr/src/boot/lib/libstand/bootp.c
+++ b/usr/src/boot/lib/libstand/bootp.c
@@ -419,6 +419,10 @@ vend_rfc1048(u_char *cp, u_int len)
 			bcopy(cp, &dhcp_serverip.s_addr,
 			      sizeof(dhcp_serverip.s_addr));
 		}
+		if (tag == TAG_TFTP_SERVER) {
+			bcopy(cp, &tftpip.s_addr,
+			      sizeof(tftpip.s_addr));
+		}
 #endif
 		cp += size;
 	}
-- 
cgit v1.2.3