From owner-svn-src-head@freebsd.org  Fri Mar 10 17:14:10 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A33ED0649E;
 Fri, 10 Mar 2017 17:14:10 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C881D1830;
 Fri, 10 Mar 2017 17:14:09 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2AHE8Fr049737;
 Fri, 10 Mar 2017 17:14:08 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2AHE8Lg049736;
 Fri, 10 Mar 2017 17:14:08 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201703101714.v2AHE8Lg049736@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Fri, 10 Mar 2017 17:14:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r315008 - head/sys/boot/i386/libi386
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Mar 2017 17:14:10 -0000

Author: sbruno
Date: Fri Mar 10 17:14:08 2017
New Revision: 315008
URL: https://svnweb.freebsd.org/changeset/base/315008

Log:
  r314948 seems to be missing a variable or two that will break
  TFTP/MFSRoot booting via PXE.  For the TFTP_LOADER case, go ahead and
  fire off the old bootp() request to ensure that whatever is missing is
  populated.
  
  Sponsored by:	Limelight Networks

Modified:
  head/sys/boot/i386/libi386/pxe.c

Modified: head/sys/boot/i386/libi386/pxe.c
==============================================================================
--- head/sys/boot/i386/libi386/pxe.c	Fri Mar 10 16:12:16 2017	(r315007)
+++ head/sys/boot/i386/libi386/pxe.c	Fri Mar 10 17:14:08 2017	(r315008)
@@ -301,6 +301,9 @@ pxe_open(struct open_file *f, ...)
 				printf("pxe_open: loaded RFC1048 data from PXE Cache\n");
 			}
 
+#ifdef LOADER_TFTP_SUPPORT
+			bootp(pxe_sock, BOOTP_PXE);
+#endif
 			if (rootip.s_addr == 0)
 				rootip.s_addr = bootplayer.sip;
 			if (gateip.s_addr == 0)