From 0ad6148e87cd1348be81d9e83c4364a09dab2c29 Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Wed, 5 Mar 2014 10:41:13 +0100 Subject: [PATCH] networkd: restore logic for enslaving to a master bonding interface This partially reverts commit 54abf46, which unintentionally removed the enslaving support for bonding interfaces --- src/network/networkd-link.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index c10d947589f..61e257c1d53 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1194,6 +1194,27 @@ static int link_enter_enslave(Link *link) { link->enslaving ++; } + if (link->network->bond) { + log_struct_link(LOG_DEBUG, link, + "MESSAGE=%s: enslaving by '%s'", + link->ifname, link->network->bond->name, + NETDEV(link->network->bond), + NULL); + + r = netdev_enslave(link->network->bond, link, &enslave_handler); + if (r < 0) { + log_struct_link(LOG_WARNING, link, + "MESSAGE=%s: could not enslave by '%s': %s", + link->ifname, link->network->bond->name, strerror(-r), + NETDEV(link->network->bond), + NULL); + link_enter_failed(link); + return r; + } + + link->enslaving ++; + } + HASHMAP_FOREACH(vlan, link->network->vlans, i) { log_struct_link(LOG_DEBUG, link, "MESSAGE=%s: enslaving by '%s'", -- 2.39.2