aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-08-13 10:18:20 +0000
committerSteven Barth <cyrus@openwrt.org>2014-08-13 10:18:20 +0000
commitaf964cafc33041e3cc817f3ca2a5e820e2fc7377 (patch)
treee8ff030c26cc17a9bfb8e63d1dbbe2f0609db128
parenteba984b94b0e28ac0178c38eb76ccb2535490d68 (diff)
downloadupstream-af964cafc33041e3cc817f3ca2a5e820e2fc7377.tar.gz
upstream-af964cafc33041e3cc817f3ca2a5e820e2fc7377.tar.bz2
upstream-af964cafc33041e3cc817f3ca2a5e820e2fc7377.zip
ppp: enable IPv6CP by default
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 42158
-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