From: Roy Marples <roy@marples.name>
Date: Thu, 1 Aug 2013 21:26:27 +0000 (+0000)
Subject: If we don't have resolvconf, don't print a search line in
X-Git-Tag: v6.0.5~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13964770bd475ee4f3c0511e2052ec314e7d137b;p=thirdparty%2Fdhcpcd.git

If we don't have resolvconf, don't print a search line in
resolv.conf(5) if it matches the domain.
---

diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf
index 54e10c89..d0dce417 100644
--- a/dhcpcd-hooks/20-resolv.conf
+++ b/dhcpcd-hooks/20-resolv.conf
@@ -31,13 +31,12 @@ build_resolv_conf()
 		search=$(cd "$resolv_conf_dir"; \
 			key_get_value "search " ${interfaces})
 		set -- ${domain}
-		unset domain
-		if [ -n "$2" ]; then
-			search="$search $*"
-		elif [ -n "$1" ]; then
-			domain="domain $1$NL"
-		fi
-		[ -n "$search" ] && search="search $(uniqify $search)$NL"
+		domain="$1"
+		[ -n "$2" ] && search="$search $*"
+		[ -n "$search" ] && search="$(uniqify $search)"
+		[ "$domain" = "$search" ] && search=
+		[ -n "$domain" ] && domain="domain $domain$NL"
+		[ -n "$search" ] && search="search $search$NL"
 
 		# Build the nameserver list
 		srvs=$(cd "$resolv_conf_dir"; \