picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: restore logic for enslaving to a master bonding interface 

This partially reverts commit 54abf46, which unintentionally removed the
enslaving support for bonding interfaces
This commit is contained in:
Mark Oteiza 2014-03-05 10:41:13 +01:00 committed by Tom Gundersen
parent a9a245c128
commit 0ad6148e87
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/networkd-link.c
View File

@ -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'",