From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 5 May 2010 01:48:45 +0000 (+0000)
Subject: [package] ppp: pass "nodefaultroute" if defaultroute is 0, don't unconditionally... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a4aaf054538b952899ac027a942b1e4c494091ea;p=openwrt.git

[package] ppp: pass "nodefaultroute" if defaultroute is 0, don't unconditionally truncate resolv.conf, thanks cshore


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

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 69051132ed..bc18d1ec9a 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -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"