From 64098682a19d7fe24b6b4ebebe8fbb5a41e60375 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 1 Sep 2014 13:21:11 +0000 Subject: [PATCH] ppp: enable IPv6CP by default Signed-off-by: Steven Barth Backport of r42158 git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42355 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/ppp/Makefile | 2 +- package/network/services/ppp/files/ppp.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile index 4cee97a..724be30 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 8f4cdeb..f07b11f 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