[package] ppp: pass "nodefaultroute" if defaultroute is 0, don't unconditionally...
authorJo-Philipp Wich <jow@openwrt.org>
Wed, 5 May 2010 01:48:45 +0000 (01:48 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Wed, 5 May 2010 01:48:45 +0000 (01:48 +0000)
SVN-Revision: 21361

package/ppp/files/ppp.sh

index 6905113..bc18d1e 100644 (file)
@@ -59,7 +59,7 @@ start_pppd() {
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
        [ "$defaultroute" -eq 1 ] && \
-               defaultroute="defaultroute replacedefaultroute" || defaultroute=""
+               defaultroute="defaultroute replacedefaultroute" || defaultroute="nodefaultroute"
 
        local interval="${keepalive##*[, ]}"
        [ "$interval" != "$keepalive" ] || interval=5
@@ -77,7 +77,9 @@ start_pppd() {
        local peerdns
        config_get_bool peerdns "$cfg" peerdns $peer_default
 
-       echo -n "" > /tmp/resolv.conf.auto
+       if [ "$peerdns" -eq 1 ] || [ ! -e /tmp/resolv.conf.auto ]; then
+               echo -n "" > /tmp/resolv.conf.auto
+       fi
 
        [ "$peerdns" -eq 1 ] && {
                peerdns="usepeerdns"