svn commit: r230325 - head/sys/boot/i386/libi386

Sean Bruno sbruno at FreeBSD.org
Thu Jan 19 01:25:51 UTC 2012


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)


More information about the svn-src-all mailing list