svn commit: r308722 - stable/11/sys/boot/i386/libi386

[Baptiste Daroussin]

Author: bapt
Date: Wed Nov 16 07:05:42 2016
New Revision: 308722
URL: https://svnweb.freebsd.org/changeset/base/308722

Log:
  MFC r308477:
  
  make pxeboot consistent with common/dev_net.c
  
  Always define boot.netif.server in kenv in pxeboot
  Add "boot.tftproot.server" to kenv when pxeboot uses tftpfs
  Change the code order when setting env for TFTP or NFS to be the same as
  common/dev_net.c
  
  Reported by:	tsoome

Modified:
  stable/11/sys/boot/i386/libi386/pxe.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/boot/i386/libi386/pxe.c
==============================================================================
--- stable/11/sys/boot/i386/libi386/pxe.c	Wed Nov 16 07:04:49 2016	(r308721)
+++ stable/11/sys/boot/i386/libi386/pxe.c	Wed Nov 16 07:05:42 2016	(r308722)
@@ -311,6 +311,7 @@ pxe_open(struct open_file *f, ...)
 		setenv("boot.netif.ip", inet_ntoa(myip), 1);
 		setenv("boot.netif.netmask", intoa(netmask), 1);
 		setenv("boot.netif.gateway", inet_ntoa(gateip), 1);
+		setenv("boot.netif.server", inet_ntoa(rootip), 1);
 		if (bootplayer.Hardware == ETHER_TYPE) {
 		    sprintf(temp, "%6D", bootplayer.CAddr, ":");
 		    setenv("boot.netif.hwaddr", temp, 1);
@@ -324,12 +325,12 @@ pxe_open(struct open_file *f, ...)
 		printf("pxe_open: server path: %s\n", rootpath);
 		printf("pxe_open: gateway ip:  %s\n", inet_ntoa(gateip));
 
-		if (netproto == NET_NFS) {
+		if (netproto == NET_TFTP) {
+			setenv("boot.tftproot.server", inet_ntoa(rootip), 1);
+			setenv("boot.tftproot.path", rootpath, 1);
+		} else if (netproto == NET_NFS) {
 			setenv("boot.nfsroot.server", inet_ntoa(rootip), 1);
 			setenv("boot.nfsroot.path", rootpath, 1);
-		} else if (netproto == NET_TFTP) {
-			setenv("boot.netif.server", inet_ntoa(rootip), 1);
-			setenv("boot.tftproot.path", rootpath, 1);
 		}
 		setenv("dhcp.host-name", hostname, 1);