summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-12-30 14:07:23 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-01-02 10:37:10 +0100
commitf3ef324dfa72ee1d0e113dbb234c643d8f0286f0 (patch)
treee0f070b10cddc8e2f2cc03ffef7e0d7cc6b99d95 /src/network
parentMerge pull request #11291 from yuwata/fix-11259 (diff)
downloadsystemd-f3ef324dfa72ee1d0e113dbb234c643d8f0286f0.tar.xz
systemd-f3ef324dfa72ee1d0e113dbb234c643d8f0286f0.zip
network: do not ignore errors on link_request_set_neighbors() and link_set_routing_policy()
Diffstat (limited to 'src/network')
-rw-r--r--src/network/networkd-link.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index cadf7f8b0b..589a016314 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -866,7 +866,9 @@ static int link_request_set_routes(Link *link) {
link_set_state(link, LINK_STATE_CONFIGURING);
- (void) link_set_routing_policy_rule(link);
+ r = link_set_routing_policy_rule(link);
+ if (r < 0)
+ return r;
/* First add the routes that enable us to talk to gateways, then add in the others that need a gateway. */
for (phase = 0; phase < _PHASE_MAX; phase++)
@@ -1079,7 +1081,9 @@ static int link_request_set_addresses(Link *link) {
link_set_state(link, LINK_STATE_CONFIGURING);
- link_request_set_neighbors(link);
+ r = link_request_set_neighbors(link);
+ if (r < 0)
+ return r;
LIST_FOREACH(addresses, ad, link->network->static_addresses) {
r = address_configure(ad, link, address_handler, false);
@@ -1216,7 +1220,7 @@ static int link_request_set_addresses(Link *link) {
return 0;
}
- }
+ }
log_link_debug(link, "Offering DHCPv4 leases");
}