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

	the direct route for server/gateway.

diff --git a/ChangeLog b/ChangeLog
index adf2dd547da89deea688ec8af7e673148084adc8..8fa0a9f55298e085ca405ed315453bb45edff0a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 7bd5e2034f1e62f51c1e71bc230db9e431e044a0..bc07d535103f67c52a09f7f94f54f625981236b0 100644 (file)
--- 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);
     }