rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-15 14:40:51 +00:00
Code Issues Releases Wiki Activity

lets also not replace routes :(

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-03-13 14:27:24 +10:00
parent 78c08c4dd9
commit 8a4fa93202
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netconf/netconf_linux.go
View File

@@ -306,6 +306,7 @@ func setGateway(gateway string, add bool) error {
log.Errorf("gateway add failed: %v", err) log.Errorf("gateway add failed: %v", err)
return err return err
} }
log.Infof("Added default gateway %s", gateway)
} else { } else {
if err := netlink.RouteReplace(&route); err == syscall.EEXIST { if err := netlink.RouteReplace(&route); err == syscall.EEXIST {
//Ignore this error //Ignore this error
@@ -313,9 +314,9 @@ func setGateway(gateway string, add bool) error {
log.Errorf("gateway replace failed: %v", err) log.Errorf("gateway replace failed: %v", err)
return err return err
} }
log.Infof("Replaced default gateway %s", gateway)
} }
log.Infof("Set default gateway %s", gateway)
return nil return nil
} }
@@ -406,7 +407,7 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
} }
// replace the existing gw with the main ipv4 one // replace the existing gw with the main ipv4 one
if err := setGateway(netConf.Gateway, false); err != nil { if err := setGateway(netConf.Gateway, true); err != nil {
log.Errorf("Fail to set gateway %s", netConf.Gateway) log.Errorf("Fail to set gateway %s", netConf.Gateway)
} }
//and then add the ipv6 one if it exists //and then add the ipv6 one if it exists