From 5e57bc0c990c10559da983ab07c7cc34edb10f1a Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 12 Sep 2017 15:00:20 +1000 Subject: [PATCH] dhcpcd overwrites resolv.conf when releasing a lease Signed-off-by: Sven Dowideit --- cmd/network/network.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/cmd/network/network.go b/cmd/network/network.go index 2c201732..4a0a8e62 100755 --- a/cmd/network/network.go +++ b/cmd/network/network.go @@ -35,11 +35,6 @@ func Main() { func ApplyNetworkConfig(cfg *config.CloudConfig) { log.Infof("Apply Network Config") 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 { log.Error(err) @@ -65,6 +60,14 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) { 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") log.Debugf("Resolve.conf == [%s], %s", resolve, err)