Skip to content

Commit

Permalink
Merge pull request containernetworking#147 from databus23/host-device…
Browse files Browse the repository at this point in the history
…-fix

host-device: Ensure device is down before rename
  • Loading branch information
dcbw committed May 16, 2018
2 parents dfbaecc + eb41020 commit 1d973f5
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions plugins/main/host-device/host-device.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ func moveLinkOut(containerNs ns.NetNS, ifName string) error {
if err != nil {
return fmt.Errorf("failed to find %q: %v", ifName, err)
}

// Devices can be renamed only when down
if err := netlink.LinkSetDown(dev); err != nil {
return fmt.Errorf("failed to set %q down: %v", ifName, err)
}
// Rename device to it's original name
if err := netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil {
return fmt.Errorf("failed to restore %q to original name %q: %v", ifName, dev.Attrs().Alias, err)
Expand Down

0 comments on commit 1d973f5

Please sign in to comment.