From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 31 Jan 2020 10:06:34 +0000 (+0000)
Subject: PPP: Always fetch DNS servers from provider
X-Git-Tag: v2.25-core141~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3ae88cab9ac01c39f0b91b743a59eed19008692;p=ipfire-2.x.git

PPP: Always fetch DNS servers from provider

We will later decide whether we want to use them or not

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index b619836ae7..e154cc8b11 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -376,16 +376,6 @@ case "${1}" in
 				AUTH=""
 			fi
 
-			### DNS Config
-			#
-			if [ "${DNS}" == "Automatic" ]; then
-				DNS="usepeerdns"
-			else
-				DNS=""
-				echo nameserver=$DNS1 > /etc/ppp/resolv.conf
-				echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-			fi
-
 			### Dial On Demand		
 			#
 			if [ "${RECONNECTION}" != "persistent" ]; then
@@ -417,7 +407,7 @@ case "${1}" in
 		
 			### Standard PPP options we always use
 			#
-			PPP_STD_OPTIONS="$PLUGOPTS $DNS defaultroute noipdefault noauth"
+			PPP_STD_OPTIONS="$PLUGOPTS usepeerdns defaultroute noipdefault noauth"
 			PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
 			PPP_STD_OPTIONS+=" noaccomp nodeflate nopcomp novj novjccomp"
 			PPP_STD_OPTIONS+=" nobsdcomp user ${USERNAME} lcp-echo-interval 20"