Browse Source

ppp: enable IPv6CP by default

Signed-off-by: Steven Barth <[email protected]>

SVN-Revision: 42158
Steven Barth 11 years ago
parent
commit
af964cafc3

+ 1 - 1
package/network/services/ppp/Makefile

@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 
 PKG_NAME:=ppp
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.6
 PKG_VERSION:=2.4.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

+ 5 - 1
package/network/services/ppp/files/ppp.sh

@@ -26,7 +26,11 @@ ppp_generic_setup() {
 	local config="$1"; shift
 	local config="$1"; shift
 
 
 	json_get_vars ipv6 demand keepalive username password pppd_options pppname
 	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
 	if [ "${demand:-0}" -gt 0 ]; then
 		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
 		demand="precompiled-active-filter /etc/ppp/filter demand idle $demand"
 	else
 	else