rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-01 06:59:05 +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.
This commit is contained in:
Sven Dowideit 2017-06-29 22:12:21 +10:00 committed by GitHub
commit f673138932
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/network/network.go
View File

@ -42,6 +42,7 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
}
// TODO: don't write to the file if nameservers is still empty
log.Infof("Writing resolv.conf (%v) %v", nameservers, search)
if _, err := resolvconf.Build("/etc/resolv.conf", nameservers, search, nil); err != nil {
log.Error(err)
}

1
dfs/scratch.go
View File

@ -351,6 +351,7 @@ ff02::2 ip6-allrouters
127.0.1.1 `+hostname)
if len(cfg.DNSConfig.Nameservers) != 0 {
log.Infof("Writing resolv.conf (%v) %v", cfg.DNSConfig.Nameservers, cfg.DNSConfig.Search)
if _, err := resolvconf.Build("/etc/resolv.conf", cfg.DNSConfig.Nameservers, cfg.DNSConfig.Search, nil); err != nil {
return err
}

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, " "))