svn commit: r318988 - head/sys/boot/i386/loader

[Baptiste Daroussin]

Author: bapt
Date: Sat May 27 12:20:13 2017
New Revision: 318988
URL: https://svnweb.freebsd.org/changeset/base/318988

Log:
  Always build tftpfs support along with nfs for pxeboot
  
  This change was already done for loader.efi

Modified:
  head/sys/boot/i386/loader/Makefile

Modified: head/sys/boot/i386/loader/Makefile
==============================================================================
--- head/sys/boot/i386/loader/Makefile	Sat May 27 12:06:52 2017	(r318987)
+++ head/sys/boot/i386/loader/Makefile	Sat May 27 12:20:13 2017	(r318988)
@@ -10,6 +10,8 @@ INTERNALPROG=
 NEWVERSWHAT?=	"bootstrap loader" x86
 VERSION_FILE=	${.CURDIR}/../loader/version
 LOADER_NET_SUPPORT?=	yes
+LOADER_NFS_SUPPORT?=	yes
+LOADER_TFTP_SUPPORT?=	yes
 
 # architecture-specific loader code
 SRCS=		main.c conf.c vers.c
@@ -30,10 +32,10 @@ LIBZFSBOOT=	${.OBJDIR}/../../zfs/libzfsb
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand
 .endif
 
-# Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)
 CFLAGS+=	-DLOADER_TFTP_SUPPORT
-.else
+.endif
+.if defined(LOADER_NFS_SUPPORT)
 CFLAGS+=	-DLOADER_NFS_SUPPORT
 .endif