From b20f71b19e24656737f40f8eb3312bcbd12dffa0 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 8 Feb 2019 22:23:18 +0100
Subject: [PATCH] interfaces: our dhclient-script doesn't clobber resolv.conf
 #3197

The FreeBSD one does, but we have different code that is "safe"
for multiple DHCP connections.
---
 src/opnsense/scripts/interfaces/dhclient-script | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/scripts/interfaces/dhclient-script b/src/opnsense/scripts/interfaces/dhclient-script
index a3a4e8465..58f8acb31 100755
--- a/src/opnsense/scripts/interfaces/dhclient-script
+++ b/src/opnsense/scripts/interfaces/dhclient-script
@@ -246,12 +246,14 @@ add_new_routes() {
 
 add_new_resolv_conf() {
 	$LOGGER "Creating resolv.conf"
+
 	if [ -f "/var/etc/nameserver_$interface" ]; then
 		# Remove old entries
 		for nameserver in `cat /var/etc/nameserver_$interface`; do
 			route delete $nameserver >/dev/null 2>&1
 		done
 	fi
+
 	if [ -n "$new_domain_name_servers" ]; then
 		rm -f /var/etc/nameserver_$interface
 		ALLOWOVERRIDE=$(grep -c dnsallowoverride /conf/config.xml)
@@ -368,9 +370,9 @@ BOUND|RENEW|REBIND|REBOOT)
 		add_new_alias
 		changes="yes"
 	fi
-	if is_default_interface; then
+	#if is_default_interface; then
 		add_new_resolv_conf
-	fi
+	#fi
 	if [ "$changes" = "yes" ] ; then
 		/usr/local/etc/rc.newwanip $interface
 	fi