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

Merge pull request #1921 from SvenDowideit/add-dhcp-wait

Browse Source 
Add dhcp wait to see if it effects the DNS race we're seeing.
(cherry picked from commit f673138932)
This commit is contained in:
Sven Dowideit
2017-06-29 22:12:21 +10:00
parent 9c125fe6c4
commit f9e2e05e14
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netconf/netconf_linux.go
View File

@@ -187,7 +187,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
}
func RunDhcp(netCfg *NetworkConfig, setHostname, setDNS bool) error {
log.Debugf("RunDhcp")
log.Debugf("RunDhcp(%V, %v)", setHostname, setDNS)
populateDefault(netCfg)
links, err := netlink.LinkList()
@@ -258,6 +258,10 @@ func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, se
args = append(args, "--nohook", "resolv.conf")
}
// Wait for lease
// TODO: this should be optional - based on kernel arg?
args = append(args, "-w", "--debug")
args = append(args, iface)
cmd := exec.Command(args[0], args[1:]...)
log.Infof("Running DHCP on %s: %s", iface, strings.Join(args, " "))