From: John Crispin <john@openwrt.org>
Date: Mon, 1 Sep 2014 13:21:11 +0000 (+0000)
Subject: ppp: enable IPv6CP by default
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=96ac5e9b24b9d555bba12d339b5af4e7c5a8819e;p=openwrt%2Fsvn-archive%2Farchive.git

ppp: enable IPv6CP by default

Signed-off-by: Steven Barth <steven@midlink.org>

Backport of r42158

SVN-Revision: 42355
---

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