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: archive/raspbian/243-5+rpi1^2~86
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b603825bcab7608aa56c24da2d0b91f3c379478f;p=systemd.git

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

Closes #13516.

(cherry picked from commit be7110826eb4d7d0fafee4790562e0dedb9d817b)
(cherry picked from commit 19e9fc4262f9063f4986d7336e3921095d6e51ed)

Gbp-Pq: Name network-do-not-abort-execution-when-a-config-file-cannot-.patch
---

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 7735b455..7853e197 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 2b8d0eb2..fe81f1b7 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;