rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-11 11:32:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1759 from rancher/dont-remove-ipv4ll-ip-either

Browse Source 
Don't auto-remove the ipv4ll ip we just added
This commit is contained in:
Sven Dowideit 2017-04-07 19:58:48 +10:00 committed by GitHub
commit 19a595773b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netconf/netconf_linux.go
View File

@ -395,7 +395,7 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
} }
for _, addr := range existingAddrs { for _, addr := range existingAddrs {
if _, ok := addrMap[addr.IPNet.String()]; !ok { if _, ok := addrMap[addr.IPNet.String()]; !ok {
if netConf.DHCP { if netConf.DHCP || netConf.IPV4LL {
// let the dhcpcd take care of it // let the dhcpcd take care of it
log.Infof("leaving %s from %s", addr.String(), link.Attrs().Name) log.Infof("leaving %s from %s", addr.String(), link.Attrs().Name)
} else { } else {