Date: Mon, 16 Jan 2006 09:30:08 GMT From: Ceri Davies <ceri@submonkey.net> To: freebsd-bugs@FreeBSD.org Subject: Re: kern/91720: pxeboot always tries to do an rpc call to an nfs-server Message-ID: <200601160930.k0G9U8H1075199@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR kern/91720; it has been noted by GNATS. From: Ceri Davies <ceri@submonkey.net> To: Ruben Kerkhof <ruben.kerkhof@gmail.com> Cc: freebsd-gnats-submit@FreeBSD.org Subject: Re: kern/91720: pxeboot always tries to do an rpc call to an nfs-server Date: Mon, 16 Jan 2006 09:25:33 +0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --Apple-Mail-5-182543395 Content-Type: multipart/mixed; boundary=Apple-Mail-4-182543296 --Apple-Mail-4-182543296 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed On 16 Jan 2006, at 07:50, Ruben Kerkhof wrote: > > Is LOADER_NFS_SUPPORT always defined by default? If not, the loader > can't boot from either NFS or TFTP if it isn't explicitly compiled > with one of the two options. No, I messed up the patch a little. In src/sys/boot/i386/loader/ Makefile, we force one or the other of LOADER_NFS_SUPPORT or LOADER_TFTP_SUPPORT so I figured we could do the same here. In that case, the patch becomes the attached. The end effect is the same, but it's better for being consistent. --Apple-Mail-4-182543296 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="91720.diff" Content-Disposition: attachment; filename=91720.diff Index: libi386/Makefile =================================================================== RCS file: /usr/home/ncvs/src/sys/boot/i386/libi386/Makefile,v retrieving revision 1.37 diff -u -r1.37 Makefile --- libi386/Makefile 24 Oct 2004 15:32:49 -0000 1.37 +++ libi386/Makefile 16 Jan 2006 09:23:00 -0000 @@ -10,6 +10,13 @@ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ 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} Index: libi386/pxe.c =================================================================== RCS file: /usr/home/ncvs/src/sys/boot/i386/libi386/pxe.c,v retrieving revision 1.22 diff -u -r1.22 pxe.c --- libi386/pxe.c 17 Apr 2005 21:38:22 -0000 1.22 +++ libi386/pxe.c 15 Jan 2006 23:48:39 -0000 @@ -335,8 +335,10 @@ 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) { --Apple-Mail-4-182543296 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Cheers, Ceri -- That must be wonderful! I don't understand it at all. -- Alice --Apple-Mail-4-182543296-- --Apple-Mail-5-182543395 content-type: application/pgp-signature; x-mac-type=70674453; name=PGP.sig content-description: This is a digitally signed message part content-disposition: inline; filename=PGP.sig content-transfer-encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (Darwin) iD8DBQFDy2aNme8yCsQvJJ0RAujmAJ9cl4bX+aYVak2npIViuNl9IygwpwCgg12m ZX/GExh34xAsswRekwr8pw0= =kluf -----END PGP SIGNATURE----- --Apple-Mail-5-182543395--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601160930.k0G9U8H1075199>