From owner-svn-src-all@freebsd.org Wed Aug 31 13:22:32 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2205BC947C; Wed, 31 Aug 2016 13:22:32 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 42FA6B5F; Wed, 31 Aug 2016 13:22:32 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wm0-x22a.google.com with SMTP id w2so30973971wmd.0; Wed, 31 Aug 2016 06:22:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=AeJaKDm4dWdKrJN/rgTmJ1o6ufU5qE4oY3rHIphfX9o=; b=APOQBrOveuP339YGZ772v/1ZP0PvT7jUq1rqZNJVYlhaJo1kfyikD0/f29yUtVcO/2 iovbF1TOeQtlAhiRSO/t09cmvWl8B56xlV+7KduUgIVpdnqyiarkBPdV+Z+tct9/zBVA nMwH5vrzTD+d4FqQDZRYVcakODZSn6ppz7RLuT2/rNZoQ2XIbKDyO/bLRpKwlmMy2RmB KZJQSCXR6wxFfevXSVC4HEwgDuD4nlQxSyCFSBl6sP0PcVRy76fWQKwiCUPy81Z1wQUk 1OHI/bAunzykQDJzS7/+DuKDqISBXo/T6Yz7/DyJv/N1FQzBsmRwDoQCf4UEkxZZM58B ybFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=AeJaKDm4dWdKrJN/rgTmJ1o6ufU5qE4oY3rHIphfX9o=; b=nC8fixhZV7wukOUI5Vrrs+7+hE78mm0G6jv6y3waehZilOSclzCx8w0/IS69ttTXdj 9uXRbdGv5binxjBfRmbVAlIJ4c7r3uVJKAa+0keU1Ttc3xK8npKgUjYUg/lQCGfkW+gq TkqmHlA2pEbpKH+npjD8WVzr9x2LnmCKiUn1iLU7r4lkNGbUiGADmgRmCdv84KnyFtOy E5hofBw8AWq0OguGtHHjP3fwtNT/3uP4V5abiFqV+y5Fsat0Dp/uD5PWiUI1MyISFnzf FvkKYpV2jInlmFAtRhzCDmUxVoZhoZ3MgYd44FT8pHrJ/kEx6DjMyOwp2i7PsW4+xfaK 6vfg== X-Gm-Message-State: AE9vXwOp5eTEu0pLPHe71N/QsCP1zBdl6998iTSEGahXjYRW9/Urk5XBvkKmeDBS7F8WQg== X-Received: by 10.194.87.67 with SMTP id v3mr8994855wjz.103.1472649750596; Wed, 31 Aug 2016 06:22:30 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id c16sm9019088wme.4.2016.08.31.06.22.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Aug 2016 06:22:29 -0700 (PDT) Sender: Baptiste Daroussin Date: Wed, 31 Aug 2016 15:22:29 +0200 From: Baptiste Daroussin To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r305125 - in head: lib/libstand sys/boot/common sys/boot/efi/libefi sys/boot/efi/loader sys/boot/i386/libi386 sys/boot/i386/loader sys/boot/pc98/loader Message-ID: <20160831132229.phrzg3itpgj7iliy@ivaldir.etoilebsd.net> References: <201608311316.u7VDGeCM029352@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3uvgvjx4c336ktya" Content-Disposition: inline In-Reply-To: <201608311316.u7VDGeCM029352@repo.freebsd.org> User-Agent: Mutt/1.6.2-neo (2016-08-08) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2016 13:22:32 -0000 --3uvgvjx4c336ktya Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Netboot: allow both tftpfs and nfs in both pxeboot and loader.efi > =20 > Add a new 'netproto' variable which can be set for now to > NET_TFTP or NET_NFS (default to NET_NONE) > =20 > 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) > =20 > 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. > =20 > 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. > =20 > Given at each open(), the loader loops over all available filesystems a= nd keep > the "best" error, we needed to prevent tftpfs to fallback on nfs and vi= ce versa. > the tftpfs and nfs implementation in libstand now return EINVAL early if > 'netproto' for that purpose. > =20 > 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 --3uvgvjx4c336ktya Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXxtoKAAoJEGOJi9zxtz5aomQQAKyADodOuYI19SEUhKY/mBVi 0II7ZsjGA/kAX6d/oDJwhx0+aPrjO9K7RdMF98GfJWQg7chbghowATKq9lUdiZzu fqMlOfJrXFjgSoHyZMBLEisF6YDpTFhLIoQgYJ0dh1K9164ane29mOIbUrvmDWeF 1wOxkW1tGSXFOZVcHUlvyNQT74mA+g4mXFd0ZmHf+s2fe80myUTDsMmSfYPyKk4M p0zcsMKPHe5hxIl7p8mDHxoPVua/QCbLlRNachWEvv7+R0yMQz5PRPdwzQdeLtD/ +VM9+asJMLh+5Z3fQYEFn4jBONTy3S+P0EUfYpyGyPFEt8EorKnonBno2huMACTT kOBleVvxLhFv+8m4JhrtHALAbqmXwXTqnYVTkXZyIbohfDYXHcmC6DmGXN7FridG xeoGv4X3l7bDVaXkYXyMaU2eHsHo5yA45mJCyvDxrq3J7WzDYUmvQqI47W+VwZPF DWTvHg2S8nTWxb1bPamJu/eVDtPxI6WUAwpwfXdESmJqCJEp90avsJg/Xca881QL mZJpd3ZRj6P03D6ZbUB7eigKcxRsJ3ZiEGANldGZFGhqq/ph+uAxvmlHllxo5dJx ILUi9rPdiOAmLixtPS78j5tkybWAfKc4udBGXqh+QVPfOxQEgaxrvoCZIsXtH930 AQyffqIIJmzx7NJGJIrz =cT4t -----END PGP SIGNATURE----- --3uvgvjx4c336ktya--