diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-15 00:35:49 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-07-15 21:52:06 +0900 |
| commit | 4ff296b02411bb4f0dc38f48cbab06f8645d2a08 (patch) | |
| tree | c2a6711e50df7eb96553f8cd3723abdb4a1eaf44 /src/network/networkd-address-label.c | |
| parent | 8eb0cafeb0aa6687e02f45e92e60fdbad7c485c0 (diff) | |
| download | systemd-4ff296b02411bb4f0dc38f48cbab06f8645d2a08.tar.gz | |
network: make link enter failed state when a configuration fails
Some path of configuring address, route or etc., go to failed state, but
some do not. E.g., failure in address configuration which is provided by
DHCPv4 goes to failed state, but static address does not.
This is just for consistency. This should not change anything if
everything is fine.
This also voidify manager_rtnl_process_address().
Diffstat (limited to 'src/network/networkd-address-label.c')
| -rw-r--r-- | src/network/networkd-address-label.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/network/networkd-address-label.c b/src/network/networkd-address-label.c index ab738448c5..108f4e8734 100644 --- a/src/network/networkd-address-label.c +++ b/src/network/networkd-address-label.c @@ -94,10 +94,12 @@ static int address_label_handler(sd_netlink *rtnl, sd_netlink_message *m, Link * return 1; r = sd_netlink_message_get_errno(m); - if (r < 0 && r != -EEXIST) + if (r < 0 && r != -EEXIST) { log_link_warning_errno(link, r, "could not set address label: %m"); - else if (r >= 0) - manager_rtnl_process_address(rtnl, m, link->manager); + link_enter_failed(link); + return 1; + } else if (r >= 0) + (void) manager_rtnl_process_address(rtnl, m, link->manager); if (link->address_label_messages == 0) log_link_debug(link, "Addresses label set"); |