From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 11 Sep 2019 09:24:41 +0000 (+0900)
Subject: network: do not abort execution when a config file cannot be loaded
X-Git-Tag: v244-rc1~315^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13526%2Fhead;p=thirdparty%2Fsystemd.git

network: do not abort execution when a config file cannot be loaded

Closes #13516.
---

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 7735b455b79..7853e197f13 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 2b8d0eb2fbb..fe81f1b7200 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;