ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #147 from databus23/host-device-fix

Browse Source 
host-device: Ensure device is down before rename
This commit is contained in:
Dan Williams 2018-05-16 10:54:47 -05:00 committed by GitHub
commit 1d973f59d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/main/host-device/host-device.go
View File

@ -143,6 +143,11 @@ func moveLinkOut(containerNs ns.NetNS, ifName string) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to find %q: %v", ifName, err) 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 // Rename device to it's original name
if err := netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil { 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) return fmt.Errorf("failed to restore %q to original name %q: %v", ifName, dev.Attrs().Alias, err)