rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-02 07:15:41 +00:00
Code Issues Releases Wiki Activity

Remove DHCP override flag

Browse Source
This commit is contained in:
Josh Curl
2016-04-15 10:38:31 -07:00
parent 8b4e6cc502
commit 8862878337
8 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/network/network.go
View File

@@ -46,7 +46,15 @@ func Main() {
log.Fatal(err)
}
if _, err := resolvconf.Build("/etc/resolv.conf", cfg.Rancher.Network.Dns.Nameservers, cfg.Rancher.Network.Dns.Search, nil); err != nil {
nameservers := cfg.Rancher.Network.Dns.Nameservers
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
}
if _, err := resolvconf.Build("/etc/resolv.conf", nameservers, search, nil); err != nil {
log.Error(err)
}
@@ -58,8 +66,8 @@ func Main() {
log.Error(err)
}
dhcpHostname := cfg.Hostname == ""
if err := netconf.RunDhcp(&cfg.Rancher.Network, dhcpHostname); err != nil {
userSetHostname := cfg.Hostname != ""
if err := netconf.RunDhcp(&cfg.Rancher.Network, !userSetHostname, !userSetDns); err != nil {
log.Error(err)
}