vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

net/dhcp: Add explicit net_dhcp command

Browse source 
Mostly for cosmetic reasons, we add a "net_dhcp" command, which is (at the
moment) identical to the existing "net_bootp" command. Both actually trigger
a DHCP handshake now, and both should be able to deal with pure BOOTP servers.
We could think about dropping the DHCP options from the initial DISCOVER packet
when the user issues the net_bootp command, but it's unclear whether this is
really useful, as both protocols should be able to coexist.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Andrei Borzenkov 2019-03-07 15:14:16 +00:00 committed by Vincent Batts
parent 723c3174e4
commit 07b96482c4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub-core/net/bootp.c
View file

@ -902,7 +902,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
return err; return err;
} }
static grub_command_t cmd_getdhcp, cmd_bootp; static grub_command_t cmd_getdhcp, cmd_bootp, cmd_dhcp;
void void
grub_bootp_init (void) grub_bootp_init (void)
@ -910,6 +910,9 @@ grub_bootp_init (void)
cmd_bootp = grub_register_command ("net_bootp", grub_cmd_bootp, cmd_bootp = grub_register_command ("net_bootp", grub_cmd_bootp,
N_("[CARD]"), N_("[CARD]"),
N_("perform a bootp autoconfiguration")); N_("perform a bootp autoconfiguration"));
cmd_dhcp = grub_register_command ("net_dhcp", grub_cmd_bootp,
N_("[CARD]"),
N_("perform a DHCP autoconfiguration"));
cmd_getdhcp = grub_register_command ("net_get_dhcp_option", grub_cmd_dhcpopt, cmd_getdhcp = grub_register_command ("net_get_dhcp_option", grub_cmd_dhcpopt,
N_("VAR INTERFACE NUMBER DESCRIPTION"), N_("VAR INTERFACE NUMBER DESCRIPTION"),
N_("retrieve DHCP option and save it into VAR. If VAR is - then print the value.")); N_("retrieve DHCP option and save it into VAR. If VAR is - then print the value."));
@ -920,4 +923,5 @@ grub_bootp_fini (void)
{ {
grub_unregister_command (cmd_getdhcp); grub_unregister_command (cmd_getdhcp);
grub_unregister_command (cmd_bootp); grub_unregister_command (cmd_bootp);
grub_unregister_command (cmd_dhcp);
} }