aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:11 +0000
committerJohn Crispin <blogic@openwrt.org>2014-09-01 13:21:11 +0000
commit5fee48f57be7efe8d82fa060458c741bf58abacc (patch)
treecdd6055318e373f56bff4d0c028b97d3067b62a6 /package/network
parent79b4b9c093b2f876e5526bd35826fbb189b8738d (diff)
downloadupstream-5fee48f57be7efe8d82fa060458c741bf58abacc.tar.gz
upstream-5fee48f57be7efe8d82fa060458c741bf58abacc.tar.bz2
upstream-5fee48f57be7efe8d82fa060458c741bf58abacc.zip
ppp: enable IPv6CP by default
Signed-off-by: Steven Barth <steven@midlink.org> Backport of r42158 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42355 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network')
-rw-r--r--package/network/services/ppp/Makefile2
-rwxr-xr-xpackage/network/services/ppp/files/ppp.sh6
2 files changed, 6 insertions, 2 deletions
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 4cee97a0a2..724be30ef3 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp
PKG_VERSION:=2.4.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index 8f4cdebcef..f07b11f3fd 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -26,7 +26,11 @@ ppp_generic_setup() {
local config="$1"; shift
json_get_vars ipv6 demand keepalive username password pppd_options pppname
- [ "$ipv6" = 1 ] || ipv6=""
+ if [ "$ipv6" = 0 ]; then
+ ipv6=""
+ else
+ ipv6=1
+ fi
if [ "${demand:-0}" -gt 0 ]; then
demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
else