diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2010-01-10 16:28:09 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-01-10 16:28:09 +0000 |
commit | 1095640d8ff4ceba476f41fd16b65dc83e8db021 (patch) | |
tree | d65b3ca3e14b2db73d73de50426cbe49f40e9ccb /package/ppp | |
parent | df702605994fd69f28dbd2e764e8c339ffbabb57 (diff) | |
download | master-187ad058-1095640d8ff4ceba476f41fd16b65dc83e8db021.tar.gz master-187ad058-1095640d8ff4ceba476f41fd16b65dc83e8db021.tar.bz2 master-187ad058-1095640d8ff4ceba476f41fd16b65dc83e8db021.zip |
[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
Diffstat (limited to 'package/ppp')
-rw-r--r-- | package/ppp/files/ppp.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 8dfdab7a0b..23fcb89ffd 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -51,9 +51,16 @@ start_pppd() { 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 |