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

Move default hostname and network under common key

Browse Source
This commit is contained in:
Josh Curl
2016-05-03 08:55:15 -07:00
parent 97344cc535
commit e51c5409aa
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/network/network.go
View File

@@ -56,8 +56,8 @@ func Main() {
search := cfg.Rancher.Network.Dns.Search
userSetDns := len(nameservers) > 0 || len(search) > 0
if !userSetDns {
nameservers = cfg.Rancher.DefaultNetwork.Dns.Nameservers
search = cfg.Rancher.DefaultNetwork.Dns.Search
nameservers = cfg.Rancher.Defaults.Network.Dns.Nameservers
search = cfg.Rancher.Defaults.Network.Dns.Search
}
if _, err := resolvconf.Build("/etc/resolv.conf", nameservers, search, nil); err != nil {