summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-09-11 18:24:41 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-09-11 21:15:22 +0900
commitbe7110826eb4d7d0fafee4790562e0dedb9d817b (patch)
tree3d3b491fc5e054e7b6d26702d96815f406769655
parent0f93577647cef5f683d83e89cc63f6124885e708 (diff)
downloadsystemd-be7110826eb4d7d0fafee4790562e0dedb9d817b.tar.gz
network: do not abort execution when a config file cannot be loaded
Closes #13516.
-rw-r--r--src/network/netdev/netdev.c2
-rw-r--r--src/network/networkd-network.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 7735b455b7..7853e197f1 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -844,7 +844,7 @@ int netdev_load(Manager *manager) {
STRV_FOREACH(f, files) {
r = netdev_load_one(manager, *f);
if (r < 0)
- return r;
+ log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
}
return 0;
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 2b8d0eb2fb..fe81f1b720 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -506,7 +506,7 @@ int network_load(Manager *manager) {
STRV_FOREACH(f, files) {
r = network_load_one(manager, *f);
if (r < 0)
- return r;
+ log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
}
return 0;