summaryrefslogtreecommitdiff
path: root/src/network/networkd.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-03-31 00:51:25 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-03-31 00:52:23 -0400
commit1db30aeab10ca716aae877b298289fe1765f14fb (patch)
treef870bf4a962a675791846222e5ee9a6d945b4c1d /src/network/networkd.c
parent97607e1ef95eee75d3ce83001517e6f660c356a0 (diff)
parent413708d106afb5ec36464c3fad56f081373320e0 (diff)
Merge pull request #2915 from vinaykul/master
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");