From 047a0dacde06740050858d72c385cc07a4091feb Mon Sep 17 00:00:00 2001
From: Jean-Sébastien Bour <jean-sebastien@bour.name>
Date: Sat, 9 Jul 2016 16:55:26 +0200
Subject: networkd: support drop-in directories for .network files

Fixes #3655.

[zj: Fix the tests.]
---
 src/network/networkd-network.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/network')

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 49faba5b12..0b36f13be8 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -40,6 +40,10 @@ static int network_load_one(Manager *manager, const char *filename) {
         _cleanup_network_free_ Network *network = NULL;
         _cleanup_fclose_ FILE *file = NULL;
         char *d;
+        const char *dropin_dirname;
+        _cleanup_strv_free_ char **dropin_dirs = NULL;
+        _cleanup_free_ char *dropin_dirs_nulstr = NULL;
+        size_t dropin_dirs_nulstr_size;
         Route *route;
         Address *address;
         int r;
@@ -137,7 +141,17 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->arp = -1;
         network->ipv6_accept_ra_use_dns = true;
 
-        r = config_parse(NULL, filename, file,
+        dropin_dirname = strjoina("/", network->name, ".network.d");
+
+        r = strv_extend_strv_concat(&dropin_dirs, (char**) network_dirs, dropin_dirname);
+        if (r < 0)
+                return r;
+
+        r = strv_make_nulstr(dropin_dirs, &dropin_dirs_nulstr, &dropin_dirs_nulstr_size);
+        if (r < 0)
+                return r;
+
+        r = config_parse_many(filename, dropin_dirs_nulstr,
                          "Match\0"
                          "Link\0"
                          "Network\0"
@@ -151,7 +165,7 @@ static int network_load_one(Manager *manager, const char *filename) {
                          "BridgeFDB\0"
                          "BridgeVLAN\0",
                          config_item_perf_lookup, network_network_gperf_lookup,
-                         false, false, true, network);
+                         false, network);
         if (r < 0)
                 return r;
 
-- 
cgit v1.2.3-54-g00ecf