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

SVN-Revision: 19093
This commit is contained in:
Jo-Philipp Wich 2010-01-10 16:28:09 +00:00
parent 7d5f49afc1
commit b28f438a37

View file

@ -52,7 +52,14 @@ start_pppd() {
[ "$interval" != "$keepalive" ] || interval=5 [ "$interval" != "$keepalive" ] || interval=5
config_get_bool peerdns "$cfg" peerdns 1 config_get_bool peerdns "$cfg" peerdns 1
[ "$peerdns" -eq 1 ] && peerdns="usepeerdns" || peerdns="" [ "$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 config_get demand "$cfg" demand
[ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto [ -n "$demand" ] && echo "nameserver 1.1.1.1" > /tmp/resolv.conf.auto