[package] ppp: process option dns if peerdns is off (#6474)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19093 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 8dfdab7..23fcb89 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -51,9 +51,16 @@ start_pppd() {
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 
        interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
 

-       config_get_bool peerdns "$cfg" peerdns 1 
-       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" 
-       
+       config_get_bool peerdns "$cfg" peerdns 1
+       [ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || {
+               peerdns=""
+               config_get dns "$config" dns
+               for dns in $dns; do
+                       grep -q "$dns" /tmp/resolv.conf.auto 2>/dev/null || \
+                               echo "nameserver $dns" >> /tmp/resolv.conf.auto
+               done
+       }
+

        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto
 
        config_get demand "$cfg" demand
        [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto