Merge pull request #143 from containernetworking/v0.7

Merge v0.7.1 fix into master
This commit is contained in:
Dan Williams
2018-04-12 09:21:42 -05:00
committed by GitHub
3 changed files with 28 additions and 2 deletions

View File

@ -43,8 +43,14 @@ func makeVethPair(name, peer string, mtu int) (netlink.Link, error) {
if err := netlink.LinkAdd(veth); err != nil {
return nil, err
}
// Re-fetch the link to get its creation-time parameters, e.g. index and mac
veth2, err := netlink.LinkByName(name)
if err != nil {
netlink.LinkDel(veth) // try and clean up the link if possible.
return nil, err
}
return veth, nil
return veth2, nil
}
func peerExists(name string) bool {