From 9202b567bcdd0c1f6a1fc2a5f36602e619960813 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Oct 2021 18:26:24 +0900 Subject: [PATCH] network: do not ignore critical errors like OOM --- src/network/networkd-network.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 358bbf5b5e9..7611476ad66 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -535,14 +535,17 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi r = network_add_ipv4ll_route(network); if (r < 0) - log_warning_errno(r, "%s: Failed to add IPv4LL route, ignoring: %m", network->filename); + return log_warning_errno(r, "%s: Failed to add IPv4LL route: %m", network->filename); r = network_add_default_route_on_device(network); if (r < 0) - log_warning_errno(r, "%s: Failed to add default route on device, ignoring: %m", - network->filename); + return log_warning_errno(r, "%s: Failed to add default route on device: %m", + network->filename); - if (network_verify(network) < 0) + r = network_verify(network); + if (r == -ENOMEM) + return r; + if (r < 0) /* Ignore .network files that do not match the conditions. */ return 0; @@ -570,7 +573,7 @@ int network_load(Manager *manager, OrderedHashmap **networks) { STRV_FOREACH(f, files) { r = network_load_one(manager, networks, *f); if (r < 0) - log_error_errno(r, "Failed to load %s, ignoring: %m", *f); + return log_error_errno(r, "Failed to load %s: %m", *f); } return 0; -- 2.47.3