summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2012-01-19 01:25:50 +0000
committersbruno <sbruno@FreeBSD.org>2012-01-19 01:25:50 +0000
commit142940515e9cd65b5186fafc7f5969a5b123c8df (patch)
treefc63103d8c4d06859b522eccfda683a27efc7d72 /sys/boot/i386
parente9eb3a867cff40b2681bf414f051e9a3edcbc591 (diff)
downloadFreeBSD-src-142940515e9cd65b5186fafc7f5969a5b123c8df.zip
FreeBSD-src-142940515e9cd65b5186fafc7f5969a5b123c8df.tar.gz
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
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/libi386/pxe.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c
index 0caee6a..dbb58de 100644
--- a/sys/boot/i386/libi386/pxe.c
+++ b/sys/boot/i386/libi386/pxe.c
@@ -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)
OpenPOWER on IntegriCloud