summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
authorJean-Sébastien Bour <jean-sebastien@bour.name>2016-07-09 16:55:26 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-09-16 10:31:58 -0400
commit047a0dacde06740050858d72c385cc07a4091feb (patch)
treed9be3919a2413d9f9c6452e675764834a419d5bd /src/network
parent38d78d1ee9f967aecda14a1c80cd664a66b976c7 (diff)
networkd: support drop-in directories for .network files
Fixes #3655. [zj: Fix the tests.]
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-network.c18
1 files changed, 16 insertions, 2 deletions
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;