summaryrefslogtreecommitdiff
path: root/src/network/networkd.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2016-03-10 14:38:42 +0100
committerTom Gundersen <teg@jklm.no>2016-03-10 14:38:42 +0100
commitead02a14ede96738250c3aac83adf9ecc1b7e2f1 (patch)
tree2c5a91b5102fe014299ef15f86f30ee3569fe260 /src/network/networkd.c
parent79c96fd20457f208c752506030295b4cf64a2994 (diff)
parentc83321e6d40b294e73e2881e4a98172c4244323b (diff)
Merge pull request #2818 from vinaykul/master
DHCP DUID and IAID configurability
Diffstat (limited to 'src/network/networkd.c')
-rw-r--r--src/network/networkd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 3a2615e6fd..c8f81a2ca6 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -21,6 +21,7 @@
#include "capability-util.h"
#include "networkd.h"
+#include "networkd-conf.h"
#include "signal-util.h"
#include "user-util.h"
@@ -89,6 +90,10 @@ int main(int argc, char *argv[]) {
goto out;
}
+ r = manager_parse_config_file(m);
+ if (r < 0)
+ log_warning_errno(r, "Failed to parse configuration file: %m");
+
r = manager_load_config(m);
if (r < 0) {
log_error_errno(r, "Could not load configuration files: %m");