summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-09-18 09:18:36 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-09-18 13:22:58 +0200
commit7f1359c14e60009a511f74a2f62d34b96deba417 (patch)
tree7b3e93d121a340290867e0aceb2dcb85d344c043
parent97ebdf93a330ef1d7ff1cf6989cfb92ac2f5a386 (diff)
downloadmtk-20170518-7f1359c14e60009a511f74a2f62d34b96deba417.zip
mtk-20170518-7f1359c14e60009a511f74a2f62d34b96deba417.tar.gz
mtk-20170518-7f1359c14e60009a511f74a2f62d34b96deba417.tar.bz2
base-files: fix wan6 interface config generation for pppoe
Setting ipv6 to auto in case of a pppoe interface will trigger the creation of a dynamic wan_6 interface meaning two IPv6 interfaces (wan6 and wan_6) will be active on top of the pppoe interface. This leads to unpredictable behavior in the network; therefore set ipv6 to 1 which will prevent the dynamic creation of the wan_6 interface. Further alias the wan6 interface on top of the wan interface for pppoe as the wan6 interface can only be started when the link local address is ready. In case of pppoe the link local address is negotiated during the Internet Protocol Control Protocol when the PPP link is setup meaning all the IP address info is only available when the wan interface is up. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/bin/config_generate7
2 files changed, 3 insertions, 6 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 305d0bf..18ebe60 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files
-PKG_RELEASE:=173
+PKG_RELEASE:=173.1
PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 6230b08..a8311fc 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -119,17 +119,14 @@ generate_network() {
;;
pppoe)
- # fixup IPv6 slave interface
- ifname="pppoe-$1"
-
uci -q batch <<-EOF
set network.$1.proto='pppoe'
set network.$1.username='username'
set network.$1.password='password'
- set network.$1.ipv6='auto'
+ set network.$1.ipv6='1'
delete network.${1}6
set network.${1}6='interface'
- set network.${1}6.ifname='$ifname'
+ set network.${1}6.ifname='@${1}'
set network.${1}6.proto='dhcpv6'
EOF
;;