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

* grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Don't create

Browse source 
the direct route for server/gateway.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-06-21 22:20:57 +02:00
parent 9d611a318d
commit 0e7ec82034
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Don't create
the direct route for server/gateway.
2012-06-21 Vladimir Serbinenko <phcoder@gmail.com> 2012-06-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Prefer * grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Prefer

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

@ -189,12 +189,9 @@ grub_net_configure_by_dhcp_ack (const char *name,
gw.ipv4 = bp->gateway_ip; gw.ipv4 = bp->gateway_ip;
grub_snprintf (rname, sizeof (rname), "%s:gw", name); grub_snprintf (rname, sizeof (rname), "%s:gw", name);
grub_net_add_route_gw (rname, target, gw); grub_net_add_route_gw (rname, target, gw);
}
if (bp->gateway_ip || bp->server_ip)
{
grub_net_network_level_netaddress_t target;
target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4; target.type = GRUB_NET_NETWORK_LEVEL_PROTOCOL_IPV4;
target.ipv4.base = bp->gateway_ip ? bp->gateway_ip : bp->server_ip; target.ipv4.base = bp->gateway_ip;
target.ipv4.masksize = 32; target.ipv4.masksize = 32;
grub_net_add_route (name, target, inter); grub_net_add_route (name, target, inter);
} }