vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Relax dns search to accept empty domain

Browse source 
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
This commit is contained in:
Fabio Falci 2014-06-26 12:03:23 +01:00
parent fe44c2e2a8
commit 74071a4fba
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
networkfs/resolvconf/resolvconf.go
View file

@ -78,8 +78,10 @@ func Build(path string, dns, dnsSearch []string) error {
}
}
if len(dnsSearch) > 0 {
if _, err := content.WriteString("search " + strings.Join(dnsSearch, " ") + "\n"); err != nil {
return err
if searchString := strings.Join(dnsSearch, " "); strings.Trim(searchString, " ") != "." {
if _, err := content.WriteString("search " + searchString + "\n"); err != nil {
return err
}
}
}