From owner-svn-src-all@FreeBSD.ORG  Thu Jan 19 01:25:51 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F570106567B;
	Thu, 19 Jan 2012 01:25:51 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E8698FC1A;
	Thu, 19 Jan 2012 01:25:51 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0J1PpSK065449;
	Thu, 19 Jan 2012 01:25:51 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0J1Poox065447;
	Thu, 19 Jan 2012 01:25:50 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201201190125.q0J1Poox065447@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Thu, 19 Jan 2012 01:25:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230325 - head/sys/boot/i386/libi386
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Jan 2012 01:25:51 -0000

Author: sbruno
Date: Thu Jan 19 01:25:50 2012
New Revision: 230325
URL: http://svn.freebsd.org/changeset/base/230325

Log:
  Wrap changes from svn r212126 inside LOADER_NFS_SUPPORT such that
  using LOADER_TFTP_SUPPORT excludes this code.  Fixes compilation of pxeldr
  with -DLOADER_TFTP_SUPPORT
  
  Applicable to stable/9 and stable/8 now.
  
  This appears to not be needed on stable/7 as r212126 has not been MFC'd.
  
  Obtained from:	Yahoo! Inc.
  MFC after:	2 weeks

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

Modified: head/sys/boot/i386/libi386/pxe.c
==============================================================================
--- head/sys/boot/i386/libi386/pxe.c	Thu Jan 19 00:11:39 2012	(r230324)
+++ head/sys/boot/i386/libi386/pxe.c	Thu Jan 19 01:25:50 2012	(r230325)
@@ -405,6 +405,7 @@ pxe_perror(int err)
 	return;
 }
 
+#ifdef LOADER_NFS_SUPPORT
 /*
  * Reach inside the libstand NFS code and dig out an NFS handle
  * for the root filesystem.
@@ -515,6 +516,7 @@ pxe_setnfshandle(char *rootpath)
 	setenv("boot.nfsroot.nfshandlelen", buf, 1);
 }
 #endif	/* OLD_NFSV2 */
+#endif /* LOADER_NFS_SUPPORT */
 
 void
 pxenv_call(int func)