KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 21361
This commit is contained in:
Jo-Philipp Wich 2010-05-05 01:48:45 +00:00
parent 3c2149a759
commit 13ebdec3f4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/ppp/files/ppp.sh
View file

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