From 8b9c74478eb4d1b7b1b430b0373d63e7d52ed8c0 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 11 Sep 2019 18:24:41 +0900 Subject: [PATCH] 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 --- src/network/netdev/netdev.c | 2 +- src/network/networkd-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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; -- 2.30.2