diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-06-26 18:11:04 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-06-26 18:11:04 +0000 |
| commit | 8079d54678fea04bbe1689b534fd75fd46a72831 (patch) | |
| tree | fb96b41ba8460b352c6d7b886a586c33603c2652 | |
| parent | 2f5a5497be451465c17e6134a10923ff18fbc32b (diff) | |
| download | upstream-8079d54678fea04bbe1689b534fd75fd46a72831.tar.gz upstream-8079d54678fea04bbe1689b534fd75fd46a72831.tar.bz2 upstream-8079d54678fea04bbe1689b534fd75fd46a72831.zip | |
ppp: interpret "demand" option as timeout in seconds (#7517)
SVN-Revision: 21903
| -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 d7dcc65f83..e0724fffa7 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 53cfb1be1a..46a66c969c 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" |