From 13ebdec3f420e4f7c09a466fe0e9039afde16793 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 5 May 2010 01:48:45 +0000
Subject: [PATCH] ppp: pass "nodefaultroute" if defaultroute is 0, don't
unconditionally truncate resolv.conf, thanks cshore
SVN-Revision: 21361
---
package/ppp/files/ppp.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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"
--
GitLab