diff options
author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-06-26 18:11:04 +0000 |
---|---|---|
committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-06-26 18:11:04 +0000 |
commit | 2d6dd9f18a11ea7ca97ac44527632269ecff913d (patch) | |
tree | f66061a8028dbb76df8040e0b722a5c9be1024da | |
parent | d04b55e43c5f5dd0999aae5b3df01d658908d481 (diff) |
[package] ppp: interpret "demand" option as timeout in seconds (#7517)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21903 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/ppp/Makefile | 2 | ||||
-rw-r--r-- | package/ppp/files/ppp.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index d7dcc65f8..e0724fffa 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp PKG_VERSION:=2.4.4 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh index 53cfb1be1..46a66c969 100644 --- a/package/ppp/files/ppp.sh +++ b/package/ppp/files/ppp.sh @@ -92,11 +92,11 @@ start_pppd() { } local demand - config_get_bool demand "$cfg" demand 0 + config_get demand "$cfg" demand 0 local demandargs - [ "$demand" -eq 1 ] && { - demandargs="precompiled-active-filter /etc/ppp/filter demand idle" + [ "$demand" -gt 0 ] && { + demandargs="precompiled-active-filter /etc/ppp/filter demand idle $demand" [ "$has_dns" -eq 0 ] && add_dns "$cfg" 1.1.1.1 } || { demandargs="persist" |