[systemd-commits] 2 commits - src/network TODO units/systemd-networkd-wait-online.service.in

[Tom Gundersen]

 TODO                                          |    1 +
 src/network/networkd-link.c                   |    2 ++
 units/systemd-networkd-wait-online.service.in |    2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 3005a221f1f2d7bc6e6f1a4df6b40e7d8bbd7e9e
Author: Tom Gundersen <teg at jklm.no>
Date:   Sun Jun 29 23:58:18 2014 +0200

    units: networkd - don't order wait-online.service before network.target
    
    Reported by Michael Olbrich.

diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in
index 8597f7c..a9bad7a 100644
--- a/units/systemd-networkd-wait-online.service.in
+++ b/units/systemd-networkd-wait-online.service.in
@@ -12,7 +12,7 @@ DefaultDependencies=no
 Conflicts=shutdown.target
 Requisite=systemd-networkd.service
 After=systemd-networkd.service
-Before=network.target network-online.target
+Before=network-online.target
 
 [Service]
 Type=oneshot

commit 3e53303ea6e416eb46db838a37faaf685489ad85
Author: Tom Gundersen <teg at jklm.no>
Date:   Sun Jun 29 23:47:13 2014 +0200

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

diff --git a/TODO b/TODO
index 10139e3..b63db04 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 b597b16..8df7ff5 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) {