From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 10 Sep 2016 13:32:19 +0000 (+0100)
Subject: networkd: support drop-in dirs for .network files
X-Git-Tag: v232~203^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cc34d5b91684256530242b94bf6ea1f27ffa7a9;p=thirdparty%2Fsystemd.git

networkd: support drop-in dirs for .network files
---

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index e7edc366afe..9cf678a3ef0 100644
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -577,6 +577,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
         _cleanup_netdev_unref_ NetDev *netdev = NULL;
         _cleanup_free_ NetDev *netdev_raw = NULL;
         _cleanup_fclose_ FILE *file = NULL;
+        const char *dropin_dirname;
         int r;
 
         assert(manager);
@@ -600,11 +601,12 @@ static int netdev_load_one(Manager *manager, const char *filename) {
                 return log_oom();
 
         netdev_raw->kind = _NETDEV_KIND_INVALID;
+        dropin_dirname = strjoina(basename(filename), ".d");
 
-        r = config_parse(NULL, filename, file,
-                         "Match\0NetDev\0",
-                         config_item_perf_lookup, network_netdev_gperf_lookup,
-                         true, false, true, netdev_raw);
+        r = config_parse_many(filename, network_dirs, dropin_dirname,
+                              "Match\0NetDev\0",
+                              config_item_perf_lookup, network_netdev_gperf_lookup,
+                              true, netdev_raw);
         if (r < 0)
                 return r;