From: Susant Sahani <ssahani@redhat.com>
Date: Mon, 25 Apr 2016 07:07:10 +0000 (+0530)
Subject: networkd: Fix route properties.
X-Git-Tag: v230~139^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cacc1dbf17e839a8a10ee3c43c2bb2bf8bda7642;p=thirdparty%2Fsystemd.git

networkd: Fix route properties.

We are not able to add multiple properties.

wlp3s0.network:
[Match]
Name=wlp3s0

[Route]
Gateway=10.68.5.26
Metric=10

 sudo ./systemd-networkd
Failed to parse file '/usr/lib/systemd/network/wlp3s0.network': File
exists
Could not load configuration files: File exists

This patch fixes it.
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index ab9b777d9a8..bda2707e6da 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -68,15 +68,15 @@ int route_new_static(Network *network, unsigned section, Route **ret) {
         route->protocol = RTPROT_STATIC;
 
         if (section) {
+                route->section = section;
+
                 r = hashmap_put(network->routes_by_section, UINT_TO_PTR(route->section), route);
                 if (r < 0)
                         return r;
-
-                route->section = section;
         }
 
-        LIST_PREPEND(routes, network->static_routes, route);
         route->network = network;
+        LIST_PREPEND(routes, network->static_routes, route);
 
         *ret = route;
         route = NULL;