]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
PPP: Always fetch DNS servers from provider
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 31 Jan 2020 10:06:34 +0000 (10:06 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 31 Jan 2020 10:06:34 +0000 (10:06 +0000)
We will later decide whether we want to use them or not

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/initscripts/networking/red

index b619836ae73e2523bab35017ae05f9c0540ee136..e154cc8b1133e5aa2b6d83fd7417a6dbdf4002ad 100644 (file)
@@ -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"