Date: Fri, 22 Nov 2019 12:57:57 -0800 From: Ravi Pokala <rpokala@freebsd.org> To: Dave Cottlehuber <dch@FreeBSD.org>, <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org> Subject: Re: svn commit: r355019 - head/sbin/dhclient Message-ID: <889BDE00-4DF2-4C78-8978-951626A61089@panasas.com> In-Reply-To: <201911222022.xAMKMGMD021163@repo.freebsd.org> References: <201911222022.xAMKMGMD021163@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi Dave,
These changes are to sbin/dhclient; how does that help loader.efi?
Thanks,
Ravi (rpokala@)
=EF=BB=BF-----Original Message-----
From: <owner-src-committers@freebsd.org> on behalf of Dave Cottlehuber <dch=
@FreeBSD.org>
Date: 2019-11-22, Friday at 12:22
To: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@=
freebsd.org>
Subject: svn commit: r355019 - head/sbin/dhclient
Author: dch (ports committer)
Date: Fri Nov 22 20:22:16 2019
New Revision: 355019
URL: https://svnweb.freebsd.org/changeset/base/355019
=20
Log:
dhclient: support option 114, default-url ascii
=20
This will enable further automation of HTTP UEFI boot loader support =
by
providing a specific option for providing the boot URL to FreeBSD.
=20
Documented in:
=20
https://www.iana.org/assignments/bootp-dhcp-parameters/bootp-dhcp-par=
ameters.xhtml
https://kb.isc.org/docs/isc-dhcp-44-manual-pages-dhcp-options
https://tools.ietf.org/html/rfc3679
=20
Approved by: emaste
MFC after: 2 weeks
Sponsored by: SkunkWerks, GmbH
Differential Revision: https://reviews.freebsd.org/D22475
=20
Modified:
head/sbin/dhclient/dhclient.c
head/sbin/dhclient/dhcp-options.5
head/sbin/dhclient/dhcp.h
head/sbin/dhclient/tables.c
=20
Modified: head/sbin/dhclient/dhclient.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
--- head/sbin/dhclient/dhclient.c Fri Nov 22 20:20:37 2019 (r355018)
+++ head/sbin/dhclient/dhclient.c Fri Nov 22 20:22:16 2019 (r355019)
@@ -2601,6 +2601,7 @@ check_option(struct client_lease *l, int option)
case DHO_DHCP_CLIENT_IDENTIFIER:
case DHO_BOOTFILE_NAME:
case DHO_DHCP_USER_CLASS_ID:
+ case DHO_URL:
case DHO_END:
return (1);
case DHO_CLASSLESS_ROUTES:
=20
Modified: head/sbin/dhclient/dhcp-options.5
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
--- head/sbin/dhclient/dhcp-options.5 Fri Nov 22 20:20:37 2019 (r355018=
)
+++ head/sbin/dhclient/dhcp-options.5 Fri Nov 22 20:22:16 2019 (r355019=
)
@@ -587,6 +587,9 @@ Servers should be listed in order of preference.
The StreetTalk Directory Assistance (STDA) server option specifies a
list of STDA servers available to the client.
Servers should be listed in order of preference.
+.It Ic option url Ar string ;
+This option specifies the URL that the client may use when using UEFI
+boot from a HTTP server.
.El
.Sh SEE ALSO
.Xr dhclient.conf 5 ,
@@ -595,7 +598,7 @@ Servers should be listed in order of preference.
.Xr dhclient 8 ,
.Xr dhcpd 8
.Rs
-.%R "RFC 2131, RFC 2132"
+.%R "RFC 2131, RFC 2132, RFC 3769"
.Re
.Sh AUTHORS
.An -nosplit
=20
Modified: head/sbin/dhclient/dhcp.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
--- head/sbin/dhclient/dhcp.h Fri Nov 22 20:20:37 2019 (r355018)
+++ head/sbin/dhclient/dhcp.h Fri Nov 22 20:22:16 2019 (r355019)
@@ -171,6 +171,7 @@ struct dhcp_packet {
#define DHO_STREETTALK_SERVER 75
#define DHO_STREETTALK_DA_SERVER 76
#define DHO_DHCP_USER_CLASS_ID 77
+#define DHO_URL 114
#define DHO_DOMAIN_SEARCH 119
#define DHO_CLASSLESS_ROUTES 121
#define DHO_END 255
=20
Modified: head/sbin/dhclient/tables.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D
--- head/sbin/dhclient/tables.c Fri Nov 22 20:20:37 2019 (r355018)
+++ head/sbin/dhclient/tables.c Fri Nov 22 20:22:16 2019 (r355019)
@@ -181,7 +181,7 @@ struct option dhcp_options[256] =3D {
{ "option-111", "X", &dhcp_universe, 111 },
{ "option-112", "X", &dhcp_universe, 112 },
{ "option-113", "X", &dhcp_universe, 113 },
- { "option-114", "X", &dhcp_universe, 114 },
+ { "url", "t", &dhcp_universe, 114 },
{ "option-115", "X", &dhcp_universe, 115 },
{ "option-116", "X", &dhcp_universe, 116 },
{ "option-117", "X", &dhcp_universe, 117 },
@@ -404,11 +404,12 @@ unsigned char dhcp_option_default_priority_list[]=
=3D {
DHO_STREETTALK_DA_SERVER,
DHO_DHCP_USER_CLASS_ID,
DHO_DOMAIN_SEARCH,
+ DHO_URL,
=20
/* Presently-undefined options... */
62, 63, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 106, 107, 108, 109, 110, 111, 112, 113, 115, 116, 117,
118, 120, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154,
=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?889BDE00-4DF2-4C78-8978-951626A61089>