diff options
| author | Roy Marples <roy@marples.name> | 2016-05-23 19:17:14 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2016-05-23 19:17:14 +0000 |
| commit | 581ae78baa039081155a814eaa122635196b8779 (patch) | |
| tree | 7df49e267b5ac9b950f4c6c366abe964693226b1 | |
| parent | 038cd1c81dac500ea7e2237809222b0e42ee20c1 (diff) | |
| download | dhcpcd-581ae78baa039081155a814eaa122635196b8779.tar.xz | |
Don't create blank dns entries, thanks to Jacques.
| -rw-r--r-- | dhcpcd-hooks/20-resolv.conf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dhcpcd-hooks/20-resolv.conf b/dhcpcd-hooks/20-resolv.conf index 35c40644..de9013bc 100644 --- a/dhcpcd-hooks/20-resolv.conf +++ b/dhcpcd-hooks/20-resolv.conf @@ -92,8 +92,8 @@ eval_nd_dns() [ -z "$rdnss" -a -z "$dnssl" ] && return 1 - new_rdnss="$new_rdnss${new_rdnss:+ }$rdnss" - new_dnssl="$new_dnssl${new_dnssl:+ }$dnssl" + [ -n "$rdnss" ] && new_rdnss="$new_rdnss${new_rdnss:+ }$rdnss" + [ -n "$dnssl" ] && new_dnssl="$new_dnssl${new_dnssl:+ }$dnssl" j=$(($j + 1)) return 0 } @@ -114,8 +114,10 @@ add_resolv_conf() j=1 eval_nd_dns || break done - new_domain_name_servers="$new_domain_name_servers${new_domain_name_servers:+ }$new_rdnss" - new_domain_search="$new_domain_search${new_domain_search:+ }$new_dnssl" + [ -n "$new_rdnss" ] && \ + new_domain_name_servers="$new_domain_name_servers${new_domain_name_servers:+ }$new_rdnss" + [ -n "$new_dnssl" ] && \ + new_domain_search="$new_domain_search${new_domain_search:+ }$new_dnssl" # Derive a new domain from our various hostname options if [ -z "$new_domain_name" ]; then |