From 0e7ec82034caf633a7eb586c88a489b26ed3da8e Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 21 Jun 2012 22:20:57 +0200 Subject: [PATCH] * grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Don't create the direct route for server/gateway. --- ChangeLog | 5 +++++ grub-core/net/bootp.c | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index adf2dd547..8fa0a9f55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-21 Vladimir Serbinenko + + * 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 * grub-core/net/bootp.c (grub_net_configure_by_dhcp_ack): Prefer diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c index 7bd5e2034..bc07d5351 100644 --- a/grub-core/net/bootp.c +++ b/grub-core/net/bootp.c @@ -189,12 +189,9 @@ grub_net_configure_by_dhcp_ack (const char *name, gw.ipv4 = bp->gateway_ip; grub_snprintf (rname, sizeof (rname), "%s:gw", name); 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.ipv4.base = bp->gateway_ip ? bp->gateway_ip : bp->server_ip; + target.ipv4.base = bp->gateway_ip; target.ipv4.masksize = 32; grub_net_add_route (name, target, inter); }