clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10005 from estesp/fix-localhost-nameserver-cleanup

Browse Source 
Clean up localhost resolv logic and add IPv6 support to regexp
This commit is contained in:
Alexander Morozov
2015-01-20 10:30:06 -08:00
parent b2fe1b3dd9 93d51e5e97
commit e9d3e237e5
5 changed files with 115 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon.go
+1 -1
View File
@@ -435,7 +435,7 @@ func (daemon *Daemon) setupResolvconfWatcher() error {
log.Debugf("Error retrieving updated host resolv.conf: %v", err)
} else if updatedResolvConf != nil {
// because the new host resolv.conf might have localhost nameservers..
updatedResolvConf, modified := resolvconf.RemoveReplaceLocalDns(updatedResolvConf)
updatedResolvConf, modified := resolvconf.FilterResolvDns(updatedResolvConf, daemon.config.EnableIPv6)
if modified {
// changes have occurred during localhost cleanup: generate an updated hash
newHash, err := utils.HashData(bytes.NewReader(updatedResolvConf))