Skip to content

Commit ea46479

Browse files
committed
underlay: get address/route before setting nm managed to no (#2592)
1 parent d67d40d commit ea46479

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

pkg/daemon/init_linux.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,6 @@ func changeProvideNicName(current, target string) (bool, error) {
105105
return true, nil
106106
}
107107

108-
// set link unmanaged by NetworkManager
109-
if err = nmSetManaged(current, false); err != nil {
110-
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", current, err)
111-
return false, err
112-
}
113-
114-
klog.Infof("renaming link %s as %s", current, target)
115108
addresses, err := netlink.AddrList(link, netlink.FAMILY_ALL)
116109
if err != nil {
117110
klog.Errorf("failed to list addresses of link %s: %v", current, err)
@@ -123,6 +116,13 @@ func changeProvideNicName(current, target string) (bool, error) {
123116
return false, err
124117
}
125118

119+
// set link unmanaged by NetworkManager
120+
if err = nmSetManaged(current, false); err != nil {
121+
klog.Errorf("failed set device %s unmanaged by NetworkManager: %v", current, err)
122+
return false, err
123+
}
124+
125+
klog.Infof("renaming link %s as %s", current, target)
126126
if err = netlink.LinkSetDown(link); err != nil {
127127
klog.Errorf("failed to set link %s down: %v", current, err)
128128
return false, err

0 commit comments

Comments
 (0)