Merge pull request #13117 from Luap99/resolv

Revert "Move each search dns to its own line"
containers · Feb 3, 2022 · 08930b2 · 08930b2
2 parents 51cc0ed + 25e0734
commit 08930b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/pkg/resolvconf/resolvconf.go b/pkg/resolvconf/resolvconf.go
@@ -221,9 +221,11 @@ func GetOptions(resolvConf []byte) []string {
 // dnsSearch, and an "options" entry for every element in dnsOptions.
 func Build(path string, dns, dnsSearch, dnsOptions []string) (*File, error) {
 	content := bytes.NewBuffer(nil)
-	for _, search := range dnsSearch {
-		if _, err := content.WriteString("search " + search + "\n"); err != nil {
-			return nil, err
+	if len(dnsSearch) > 0 {
+		if searchString := strings.Join(dnsSearch, " "); strings.Trim(searchString, " ") != "." {
+			if _, err := content.WriteString("search " + searchString + "\n"); err != nil {
+				return nil, err
+			}
 		}
 	}
 	for _, dns := range dns {

diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
@@ -597,22 +597,17 @@ load helpers
     searchIP="100.100.100.100"
     cat >$containersconf <<EOF
 [containers]
-  dns_searches  = [ "example.com", "test1.com"]
+  dns_searches  = [ "example.com"]
   dns_servers = [
     "1.1.1.1",
     "$searchIP",
     "1.0.0.1",
     "8.8.8.8",
 ]
 EOF
-export searchDNS="search example.com
-search test1.com
-search a.b"
     CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep "example.com" /etc/resolv.conf
     CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep $searchIP /etc/resolv.conf
     is "$output" "nameserver $searchIP" "Should only be one $searchIP not multiple"
-    CONTAINERS_CONF=$containersconf run_podman run --dns-search a.b --rm $IMAGE grep search /etc/resolv.conf
-    is "$output" "$searchDNS" "Searches should be on different lines"
 }
 
 # vim: filetype=sh