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 54e10c89615a712cadc48358bfe6a7644320104f..d0dce417845ababa6407ff5767182472290257cf 100644 (file)
--- 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"; \