From: Roy Marples <roy@marples.name>
Date: Thu, 1 Aug 2013 10:03:27 +0000 (+0000)
Subject: If the DNS search list is a direct match for the domain then
X-Git-Tag: v6.0.5~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=598a961702a9a99eac2317ca1325c11f9c1341ea;p=thirdparty%2Fdhcpcd.git

If the DNS search list is a direct match for the domain then
don't bother writing the search option to resolv.conf
---

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 7a5f9534..54e10c89 100644
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -113,7 +113,9 @@ add_resolv_conf()
 			new_domain_search="$*"
 		fi
 	fi
-	if [ -n "$new_domain_search" ]; then
+	if [ -n "$new_domain_search" -a \
+	    "$new_domain_search" != "$new_domain_name" ]
+	then
 		if valid_domainname_list; then
 			conf="${conf}search $new_domain_search$NL"
 		else