On Wed, Aug 31, 2016 at 01:16:40PM +0000, Baptiste Daroussin wrote: > Author: bapt > Date: Wed Aug 31 13:16:40 2016 > New Revision: 305125 > URL: https://svnweb.freebsd.org/changeset/base/305125 > > Log: > Netboot: allow both tftpfs and nfs in both pxeboot and loader.efi > > Add a new 'netproto' variable which can be set for now to > NET_TFTP or NET_NFS (default to NET_NONE) > > From the dhcp options if one sets the root-path option to: > "ip:path", the loader will consider it is booting over NFS > (meaning same behaviour as the default current behaviour) > > if the dhcp option "tftp server address" is set (option 150) > the loader will consider it is booting over tftpfs, it will then > consider the root-path options with 2 possible case > 1. "path" then the IP of the tftp server will be the one passed by > the option 150, and the files will be retrieved under "path" on the tftp > server > 2. "ip:path" then the IP of the tftp server will be the one passed in > the option "overwritting the IP from the option 150. > > We could not "abuse" the rootpath option in the form or tftp://ip:path > because > this is already used for other purpose by iPXE preventing any chainload from > iPXE to the FreeBSD loader. > > Given at each open(), the loader loops over all available filesystems and > keep > the "best" error, we needed to prevent tftpfs to fallback on nfs and vice > versa. > the tftpfs and nfs implementation in libstand now return EINVAL early if > 'netproto' for that purpose. > > Reviewed by: tsoome > Relnotes: yes > Sponsored by: Gandi.net > Differential Revision: https://reviews.freebsd.org/D7628
I forgot to mention a guard was added to libstand's net.h, because it is included multiple times for some loaders Best regards, Bapt
signature.asc
Description: PGP signature