1
0
mirror of https://github.com/rancher/os.git synced 2025-09-15 22:49:08 +00:00

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

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

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)
}