SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

networkd: support drop-in directories for .network files

Browse Source 
Fixes #3655.

[zj: Fix the tests.]
This commit is contained in:
Jean-Sébastien Bour
2016-09-16 10:31:58 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 38d78d1ee9
commit 047a0dacde
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-network.c
+16 -2
View File
@@ -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;