From 4410cd5cf9c1b07e36ce072336a847411afc6e96 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Tue, 15 Sep 2015 14:52:47 +0000 Subject: ppp: use more reliable way to set script environment Signed-off-by: Steven Barth git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46942 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/services/ppp/Makefile | 2 +- package/network/services/ppp/files/ppp.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'package/network/services') 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 \ -- cgit v1.2.3