d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not attempt to make an NFS rpc call if using tftp

Browse Source 
PR:		kern/91720
Submitted by:	Ruben Kerkhof
This commit is contained in:
Paul Saab 2007-10-12 17:09:43 +00:00
parent 45650f529d
commit 671a6b8e9a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=172591
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/boot/i386/libi386/Makefile
View File

@ -10,6 +10,13 @@ SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \
smbios.c time.c vidconsole.c amd64_tramp.S
# Enable PXE TFTP or NFS support, not both.
.if defined(LOADER_TFTP_SUPPORT)
CFLAGS+= -DLOADER_TFTP_SUPPORT
.else
CFLAGS+= -DLOADER_NFS_SUPPORT
.endif
BOOT_COMCONSOLE_PORT?= 0x3f8
CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT}

2
sys/boot/i386/libi386/pxe.c
View File

@ -335,8 +335,10 @@ pxe_close(struct open_file *f)
if (pxe_opens > 0)
return(0);
#ifdef LOADER_NFS_SUPPORT
/* get an NFS filehandle for our root filesystem */
pxe_setnfshandle(rootpath);
#endif
if (pxe_sock >= 0) {