rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-08 04:18:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2087 from SvenDowideit/another-resolv.conf-race

Browse Source 
dhcpcd overwrites resolv.conf when releasing a lease
This commit is contained in:
Sven Dowideit 2017-09-12 15:04:16 +10:00 committed by GitHub
commit 2d65164e57
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/network/network.go
View File

@ -35,11 +35,6 @@ func Main() {
func ApplyNetworkConfig(cfg *config.CloudConfig) { func ApplyNetworkConfig(cfg *config.CloudConfig) {
log.Infof("Apply Network Config") log.Infof("Apply Network Config")
userSetDNS := len(cfg.Rancher.Network.DNS.Nameservers) > 0 || len(cfg.Rancher.Network.DNS.Search) > 0 userSetDNS := len(cfg.Rancher.Network.DNS.Nameservers) > 0 || len(cfg.Rancher.Network.DNS.Search) > 0
if userSetDNS {
if _, err := resolvconf.Build("/etc/resolv.conf", cfg.Rancher.Network.DNS.Nameservers, cfg.Rancher.Network.DNS.Search, nil); err != nil {
log.Error(err)
}
}
if err := hostname.SetHostnameFromCloudConfig(cfg); err != nil { if err := hostname.SetHostnameFromCloudConfig(cfg); err != nil {
log.Error(err) log.Error(err)
@ -65,6 +60,14 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
log.Error(err) log.Error(err)
} }
} }
if userSetDNS {
if _, err := resolvconf.Build("/etc/resolv.conf", cfg.Rancher.Network.DNS.Nameservers, cfg.Rancher.Network.DNS.Search, nil); err != nil {
log.Error(err)
} else {
log.Infof("writing to /etc/resolv.conf: nameservers: %v, search: %v", cfg.Rancher.Network.DNS.Nameservers, cfg.Rancher.Network.DNS.Search)
}
}
resolve, err := ioutil.ReadFile("/etc/resolv.conf") resolve, err := ioutil.ReadFile("/etc/resolv.conf")
log.Debugf("Resolve.conf == [%s], %s", resolve, err) log.Debugf("Resolve.conf == [%s], %s", resolve, err)