* [PATCH] docs: Document newly introduced net_dhcp command
@ 2019-08-21 15:58 Andre Przywara
2019-08-30 13:20 ` Daniel Kiper
0 siblings, 1 reply; 4+ messages in thread
From: Andre Przywara @ 2019-08-21 15:58 UTC (permalink / raw)
To: Daniel Kiper; +Cc: Heinrich Schuchardt, grub-devel, Andrei Borzenkov
Commit 5bc41db756c5 ("net/dhcp: Add explicit net_dhcp command")
introduced the new command "net_dhcp", which (for now) is an alias for
the existing "net_bootp". Unfortunately the TEXI documentation was not
adjusted accordingly.
Rename the existing paragraph about net_bootp to read net_dhcp instead,
and make the net_bootp stanza point to this new command.
On the way add the newly parsed TFTP_SERVER_NAME and BOOTFILE_NAME
packets to the list of supported DHCP options.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
Hi,
this addresses https://savannah.gnu.org/bugs/?56725
Cheers,
Andre.
docs/grub.texi | 71 ++++++++++++++++++++++++++++++++------------------
1 file changed, 45 insertions(+), 26 deletions(-)
diff --git a/docs/grub.texi b/docs/grub.texi
index 3d50b16ba..5ac61c09d 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -5365,10 +5365,11 @@ This command is only available on AArch64 systems.
* net_add_addr:: Add a network address
* net_add_dns:: Add a DNS server
* net_add_route:: Add routing entry
-* net_bootp:: Perform a bootp autoconfiguration
+* net_bootp:: Perform a bootp/DHCP autoconfiguration
* net_del_addr:: Remove IP address from interface
* net_del_dns:: Remove a DNS server
* net_del_route:: Remove a route entry
+* net_dhcp:: Perform a DHCP autoconfiguration
* net_get_dhcp_option:: Retrieve DHCP options
* net_ipv6_autoconf:: Perform IPv6 autoconfiguration
* net_ls_addr:: List interfaces
@@ -5415,8 +5416,44 @@ by @var{shortname} which can be used to remove it (@pxref{net_del_route}).
@subsection net_bootp
@deffn Command net_bootp [@var{card}]
+Alias for net_dhcp, for compatibility with older Grub versions. Will perform
+the same DHCP handshake with potential fallback to BOOTP as the net_dhcp
+command (@pxref{net_dhcp}).
+
+@end deffn
+
+
+@node net_del_addr
+@subsection net_del_addr
+
+@deffn Command net_del_addr @var{interface}
+Remove configured @var{interface} with associated address.
+@end deffn
+
+
+@node net_del_dns
+@subsection net_del_dns
+
+@deffn Command net_del_dns @var{address}
+Remove @var{address} from list of servers used during name lookup.
+@end deffn
+
+
+@node net_del_route
+@subsection net_del_route
+
+@deffn Command net_del_route @var{shortname}
+Remove route entry identified by @var{shortname}.
+@end deffn
+
+
+@node net_dhcp
+@subsection net_dhcp
+
+@deffn Command net_dhcp [@var{card}]
Perform configuration of @var{card} using DHCP protocol. If no card name
-is specified, try to configure all existing cards. If configuration was
+is specified, try to configure all existing cards.
+Falls back to the BOOTP protocol, if needed. If configuration was
successful, interface with name @var{card}@samp{:dhcp} and configured
address is added to @var{card}.
@comment If server provided gateway information in
@@ -5443,35 +5480,17 @@ Sets environment variable @samp{net_}@var{<card>}@samp{_dhcp_rootpath}
@item 18 (Extensions Path)
Sets environment variable @samp{net_}@var{<card>}@samp{_dhcp_extensionspath}
(@pxref{net_@var{<interface>}_extensionspath}) to the value of option.
+@item 66 (TFTP Server Name)
+Sets environment variable @samp{net_}@var{<card>}@samp{_dhcp_server_name}
+(@pxref{net_@var{<interface>}_dhcp_server_name}) to the value of option.
+@item 67 (Filename)
+Sets environment variable @samp{net_}@var{<card>}@samp{_boot_file}
+(@pxref{net_@var{<interface>}_boot_file}) to the value of option.
@end table
@end deffn
-@node net_del_addr
-@subsection net_del_addr
-
-@deffn Command net_del_addr @var{interface}
-Remove configured @var{interface} with associated address.
-@end deffn
-
-
-@node net_del_dns
-@subsection net_del_dns
-
-@deffn Command net_del_dns @var{address}
-Remove @var{address} from list of servers used during name lookup.
-@end deffn
-
-
-@node net_del_route
-@subsection net_del_route
-
-@deffn Command net_del_route @var{shortname}
-Remove route entry identified by @var{shortname}.
-@end deffn
-
-
@node net_get_dhcp_option
@subsection net_get_dhcp_option
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: Document newly introduced net_dhcp command
2019-08-21 15:58 [PATCH] docs: Document newly introduced net_dhcp command Andre Przywara
@ 2019-08-30 13:20 ` Daniel Kiper
2019-09-02 9:53 ` Andre Przywara
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Kiper @ 2019-08-30 13:20 UTC (permalink / raw)
To: Andre Przywara; +Cc: Heinrich Schuchardt, grub-devel, Andrei Borzenkov
On Wed, Aug 21, 2019 at 04:58:34PM +0100, Andre Przywara wrote:
> Commit 5bc41db756c5 ("net/dhcp: Add explicit net_dhcp command")
> introduced the new command "net_dhcp", which (for now) is an alias for
> the existing "net_bootp". Unfortunately the TEXI documentation was not
> adjusted accordingly.
>
> Rename the existing paragraph about net_bootp to read net_dhcp instead,
> and make the net_bootp stanza point to this new command.
>
> On the way add the newly parsed TFTP_SERVER_NAME and BOOTFILE_NAME
> packets to the list of supported DHCP options.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Daniel
PS Sorry for late reply but I was on vacation and later traveling.
Now I am back and will be clearing my grub-devel backlog.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: Document newly introduced net_dhcp command
2019-08-30 13:20 ` Daniel Kiper
@ 2019-09-02 9:53 ` Andre Przywara
2019-09-23 13:04 ` Daniel Kiper
0 siblings, 1 reply; 4+ messages in thread
From: Andre Przywara @ 2019-09-02 9:53 UTC (permalink / raw)
To: Daniel Kiper; +Cc: Heinrich Schuchardt, grub-devel, Andrei Borzenkov
On Fri, 30 Aug 2019 15:20:19 +0200
Daniel Kiper <dkiper@net-space.pl> wrote:
> On Wed, Aug 21, 2019 at 04:58:34PM +0100, Andre Przywara wrote:
> > Commit 5bc41db756c5 ("net/dhcp: Add explicit net_dhcp command")
> > introduced the new command "net_dhcp", which (for now) is an alias for
> > the existing "net_bootp". Unfortunately the TEXI documentation was not
> > adjusted accordingly.
> >
> > Rename the existing paragraph about net_bootp to read net_dhcp instead,
> > and make the net_bootp stanza point to this new command.
> >
> > On the way add the newly parsed TFTP_SERVER_NAME and BOOTFILE_NAME
> > packets to the list of supported DHCP options.
> >
> > Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> > Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
>
> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Thanks!
>
> Daniel
>
> PS Sorry for late reply but I was on vacation and later traveling.
Please don't apologise for having a life ;-)
Cheers,
Andre.
> Now I am back and will be clearing my grub-devel backlog.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] docs: Document newly introduced net_dhcp command
2019-09-02 9:53 ` Andre Przywara
@ 2019-09-23 13:04 ` Daniel Kiper
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Kiper @ 2019-09-23 13:04 UTC (permalink / raw)
To: Andre Przywara; +Cc: Andrei Borzenkov, Heinrich Schuchardt, grub-devel
On Mon, Sep 02, 2019 at 10:53:34AM +0100, Andre Przywara wrote:
> On Fri, 30 Aug 2019 15:20:19 +0200 Daniel Kiper <dkiper@net-space.pl> wrote:
> > On Wed, Aug 21, 2019 at 04:58:34PM +0100, Andre Przywara wrote:
> > > Commit 5bc41db756c5 ("net/dhcp: Add explicit net_dhcp command")
> > > introduced the new command "net_dhcp", which (for now) is an alias for
> > > the existing "net_bootp". Unfortunately the TEXI documentation was not
> > > adjusted accordingly.
> > >
> > > Rename the existing paragraph about net_bootp to read net_dhcp instead,
> > > and make the net_bootp stanza point to this new command.
> > >
> > > On the way add the newly parsed TFTP_SERVER_NAME and BOOTFILE_NAME
> > > packets to the list of supported DHCP options.
> > >
> > > Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> > > Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> >
> > Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
>
> Thanks!
Pushed together with other patches...
> > Daniel
> >
> > PS Sorry for late reply but I was on vacation and later traveling.
>
> Please don't apologise for having a life ;-)
...and this time I will not apologise for having a life and travel... :-)))
Daniel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-09-23 13:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-21 15:58 [PATCH] docs: Document newly introduced net_dhcp command Andre Przywara
2019-08-30 13:20 ` Daniel Kiper
2019-09-02 9:53 ` Andre Przywara
2019-09-23 13:04 ` Daniel Kiper
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.