aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/ppp
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2015-09-15 14:52:47 +0000
committerSteven Barth <steven@midlink.org>2015-09-15 14:52:47 +0000
commit4410cd5cf9c1b07e36ce072336a847411afc6e96 (patch)
tree06c37f2486186f74ba1aaf0f71049907e4640746 /package/network/services/ppp
parent7b79903dec1353fdf35d2c6e46aa3094d8ee8f10 (diff)
downloadmaster-187ad058-4410cd5cf9c1b07e36ce072336a847411afc6e96.tar.gz
master-187ad058-4410cd5cf9c1b07e36ce072336a847411afc6e96.tar.bz2
master-187ad058-4410cd5cf9c1b07e36ce072336a847411afc6e96.zip
ppp: use more reliable way to set script environment
Signed-off-by: Steven Barth <steven@midlink.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46942 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/ppp')
-rw-r--r--package/network/services/ppp/Makefile2
-rwxr-xr-xpackage/network/services/ppp/files/ppp.sh3
2 files changed, 3 insertions, 2 deletions
diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index a4122a4f93..e0acf5993e 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.7
-PKG_RELEASE:=7
+PKG_RELEASE:=8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/
diff --git a/package/network/services/ppp/files/ppp.sh b/package/network/services/ppp/files/ppp.sh
index a6389a8b93..2a7e76b7fe 100755
--- a/package/network/services/ppp/files/ppp.sh
+++ b/package/network/services/ppp/files/ppp.sh
@@ -90,7 +90,7 @@ ppp_generic_setup() {
ipv6=""
elif [ -z "$ipv6" -o "$ipv6" = auto ]; then
ipv6=1
- proto_export "AUTOIPV6=1"
+ autoipv6=1
fi
if [ "${demand:-0}" -gt 0 ]; then
@@ -126,6 +126,7 @@ ppp_generic_setup() {
${localip:+$localip:} \
${lcp_failure:+lcp-echo-interval $lcp_interval lcp-echo-failure $lcp_failure $lcp_adaptive} \
${ipv6:++ipv6} \
+ ${autoipv6:+set AUTOIPV6=1} \
nodefaultroute \
usepeerdns \
$demand maxfail 1 \