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

Merge mainline into arm

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-07-16 18:43:43 +02:00
commit ae27e4d323
111 changed files with 5383 additions and 3002 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ set_env_limn_ro (const char *intername, const char *suffix,
grub_env_set (varname, value);
value[len] = c;
grub_register_variable_hook (varname, 0, grub_env_write_readonly);
grub_env_export (varname);
}
static void
@ -212,7 +213,10 @@ grub_net_configure_by_dhcp_ack (const char *name,
}
if (is_def)
grub_env_set ("net_default_interface", name);
{
grub_env_set ("net_default_interface", name);
grub_env_export ("net_default_interface");
}
if (device && !*device && bp->server_ip)
{
@ -447,6 +451,9 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
ncards++;
}
if (ncards == 0)
return grub_error (GRUB_ERR_NET_NO_CARD, N_("no network card found"));
ifaces = grub_zalloc (ncards * sizeof (ifaces[0]));
if (!ifaces)
return grub_errno;

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

@ -891,6 +891,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
*ptr = '_';
grub_env_set (name, buf);
grub_register_variable_hook (name, 0, hwaddr_set_env);
grub_env_export (name);
}
{
@ -904,6 +905,7 @@ grub_net_network_level_interface_register (struct grub_net_network_level_interfa
*ptr = '_';
grub_env_set (name, buf);
grub_register_variable_hook (name, 0, addr_set_env);
grub_env_export (name);
}
inter->card->num_ifaces++;
@ -1643,12 +1645,16 @@ GRUB_MOD_INIT(net)
{
grub_register_variable_hook ("net_default_server", defserver_get_env,
defserver_set_env);
grub_env_export ("net_default_server");
grub_register_variable_hook ("pxe_default_server", defserver_get_env,
defserver_set_env);
grub_env_export ("pxe_default_server");
grub_register_variable_hook ("net_default_ip", defip_get_env,
defip_set_env);
grub_env_export ("net_default_ip");
grub_register_variable_hook ("net_default_mac", defmac_get_env,
defmac_set_env);
grub_env_export ("net_default_mac");
cmd_addaddr = grub_register_command ("net_add_addr", grub_cmd_addaddr,
/* TRANSLATORS: HWADDRESS stands for