diff options
| author | Roelf Wichertjes <roelf@roelf.org> | 2017-04-30 13:12:32 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-04-30 13:12:32 +0200 |
| commit | 14b6bb776287e72887071dafae3d4c2c65ee926d (patch) | |
| tree | 6f7369eec8143c0473674a44bdf234f494676e01 | |
| parent | 2766d951c9385d91e504d968551247b115a77ef6 (diff) | |
networkd: Add check to ensure link is down before attempting to enslave (#5853)
netdev to bond.
There are situations where a link can be in an "UP" state when
systemd-networkd attempts to add the link to a bond device.
This is a problem because the bonding driver will refuse to
enslave a link if it is in the "UP" state.
This check ensures systemd-networkd sets the link to "DOWN"
before attempting to add the link to the bond.
Fixes #5838.
| -rw-r--r-- | src/network/netdev/netdev.c | 8 | ||||
| -rw-r--r-- | src/network/networkd-link.c | 4 | ||||
| -rw-r--r-- | src/network/networkd-link.h | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 3848c863c5..43884581ca 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -28,6 +28,7 @@ #include "network-internal.h" #include "netdev/netdev.h" #include "networkd-manager.h" +#include "networkd-link.h" #include "siphash24.h" #include "stat-util.h" #include "string-table.h" @@ -221,6 +222,13 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_netlink_message_h assert(link); assert(callback); + if (link->flags & IFF_UP) { + log_netdev_debug(netdev, "Link '%s' was up when attempting to enslave it. Bringing link down.", link->ifname); + r = link_down(link); + if (r < 0) + return log_netdev_error_errno(netdev, r, "Could not bring link down: %m"); + } + r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_SETLINK, link->ifindex); if (r < 0) return log_netdev_error_errno(netdev, r, "Could not allocate RTM_SETLINK message: %m"); diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 48ee12a317..6ed8380942 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1644,7 +1644,7 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userda return 1; } -static int link_up(Link *link) { +int link_up(Link *link) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; uint8_t ipv6ll_mode; int r; @@ -1765,7 +1765,7 @@ static int link_down_handler(sd_netlink *rtnl, sd_netlink_message *m, void *user return 1; } -static int link_down(Link *link) { +int link_down(Link *link) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL; int r; diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 010b38248a..39c8430ac3 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -140,6 +140,9 @@ int link_get(Manager *m, int ifindex, Link **ret); int link_add(Manager *manager, sd_netlink_message *message, Link **ret); void link_drop(Link *link); +int link_up(Link *link); +int link_down(Link *link); + int link_address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata); int link_route_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata); |