diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 03:50:42 +0000 |
| commit | 78e9bb837c258ac0ec7712b3d612cc2f407e731e (patch) | |
| tree | f515d16b6efd858a9aeb5b0ef5d6f90bf288283d /src/network/networkd-conf.c | |
| parent | Adding debian version 255.5-1. (diff) | |
| download | systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.tar.xz systemd-78e9bb837c258ac0ec7712b3d612cc2f407e731e.zip | |
Merging upstream version 256.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/network/networkd-conf.c')
| -rw-r--r-- | src/network/networkd-conf.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c index 063732a..6a6814d 100644 --- a/src/network/networkd-conf.c +++ b/src/network/networkd-conf.c @@ -14,14 +14,17 @@ int manager_parse_config_file(Manager *m) { assert(m); - r = config_parse_config_file("networkd.conf", - "Network\0" - "DHCPv4\0" - "DHCPv6\0" - "DHCP\0", - config_item_perf_lookup, networkd_gperf_lookup, - CONFIG_PARSE_WARN, - m); + r = config_parse_standard_file_with_dropins( + "systemd/networkd.conf", + "Network\0" + "IPv6AcceptRA\0" + "DHCPv4\0" + "DHCPv6\0" + "DHCPServer\0" + "DHCP\0", + config_item_perf_lookup, networkd_gperf_lookup, + CONFIG_PARSE_WARN, + /* userdata= */ m); if (r < 0) return r; |