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

diff --git a/TODO b/TODO
index 10139e39df53fc96d1c244cf863434bbfd83d1d3..b63db048b4389c588d821938640bb98e1a112737 100644 (file)
--- 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
    - 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?
 
 * networkd-wait-online:
    - make operstates to wait for configurable?

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index b597b166844b4e088c7e9855c080d879ae178c61..8df7ff5d606ca9a98cb810acd25242892fa3cc40 100644 (file)
--- 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->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) {
 
                         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->family = AF_INET;
                         route->in_addr.in = gateway;

+                        route->metrics = DHCP_STATIC_ROUTE_METRIC;

 
                         r = route_configure(route, link, &route_handler);
                         if (r < 0) {
 
                         r = route_configure(route, link, &route_handler);
                         if (r < 0) {