From: Tom Gundersen <teg@jklm.no>
Date: Sun, 29 Jun 2014 21:47:13 +0000 (+0200)
Subject: networkd: dhcp - use same metric for all DHCP-related routes
X-Git-Tag: v215~115
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=3e53303ea6e416eb46db838a37faaf685489ad85;ds=sidebyside

networkd: dhcp - use same metric for all DHCP-related routes
---

diff --git a/TODO b/TODO
index 10139e39d..b63db048b 100644
--- a/TODO
+++ b/TODO
@@ -615,6 +615,7 @@ Features:
    - add veth netdev support (c.f. http://shorewall.net/bridge-Shorewall-perl.html#veth)
    - add tun/tap netdev support
    - add more attribute support for SIT tunnel
+   - make metric of routes configurable
 
 * networkd-wait-online:
    - make operstates to wait for configurable?
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index b597b1668..8df7ff5d6 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -546,6 +546,7 @@ static int link_enter_set_routes(Link *link) {
                         route_gw->dst_addr.in = gateway;
                         route_gw->dst_prefixlen = 32;
                         route_gw->scope = RT_SCOPE_LINK;
+                        route_gw->metrics = DHCP_STATIC_ROUTE_METRIC;
 
                         r = route_configure(route_gw, link, &route_handler);
                         if (r < 0) {
@@ -559,6 +560,7 @@ static int link_enter_set_routes(Link *link) {
 
                         route->family = AF_INET;
                         route->in_addr.in = gateway;
+                        route->metrics = DHCP_STATIC_ROUTE_METRIC;
 
                         r = route_configure(route, link, &route_handler);
                         if (r < 0) {