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

Reintroduce pxe: syntax

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-09-02 22:12:37 +02:00
parent 308fad6dc8
commit 9daa203944
1 changed files with 29 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
grub-core/fs/i386/pc/pxe.c
View file

@ -121,54 +121,35 @@ grub_pxefs_open (struct grub_file *file, const char *name)
if (!data) if (!data)
return grub_errno; return grub_errno;
#if 0 {
if (grub_strncmp (file->device->net->name, "pxe:", sizeof ("pxe:") - 1) == 0) grub_net_network_level_address_t addr;
{ grub_net_network_level_address_t gateway;
const char *ptr; struct grub_net_network_level_interface *interf;
grub_err_t err; grub_err_t err;
ptr = name + sizeof ("pxe:") - 1; if (grub_strncmp (file->device->net->name,
err = parse_ip (ptr, &(data->server_ip), &ptr); "pxe,", sizeof ("pxe,") - 1) == 0
if (err) || grub_strncmp (file->device->net->name,
return err; "pxe:", sizeof ("pxe:") - 1) == 0)
if (*ptr == ':') {
{ const char *ptr;
err = parse_ip (ptr + 1, &(data->gateway_ip), 0);
if (err)
return err;
}
else
data->gateway_ip = grub_pxe_default_gateway_ip;
}
else
#endif
{
grub_net_network_level_address_t addr;
grub_net_network_level_address_t gateway;
struct grub_net_network_level_interface *interf;
grub_err_t err;
if (grub_strncmp (file->device->net->name, ptr = name + sizeof ("pxe,") - 1;
"pxe,", sizeof ("pxe,") - 1) == 0) err = grub_net_resolve_address (name + sizeof ("pxe,") - 1, &addr);
{ if (err)
const char *ptr; return err;
}
ptr = name + sizeof ("pxe,") - 1; else
err = grub_net_resolve_address (name + sizeof ("pxe,") - 1, &addr); {
if (err) addr.ipv4 = grub_pxe_default_server_ip;
return err; addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
} }
else err = grub_net_route_address (addr, &gateway, &interf);
{ if (err)
addr.ipv4 = grub_pxe_default_server_ip; return err;
addr.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4; data->server_ip = addr.ipv4;
} data->gateway_ip = gateway.ipv4;
err = grub_net_route_address (addr, &gateway, &interf); }
if (err)
return err;
data->server_ip = addr.ipv4;
data->gateway_ip = gateway.ipv4;
}
if (curr_file != 0) if (curr_file != 0)
{ {