base-files: fix wan6 interface config generation for pppoe

[openwrt/openwrt.git] / package / base-files / files / bin / config_generate

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 6230b0892f04c9853706a06a9547c7e5cc249625..a8311fc595babdfeddd6d84ecf21799d0bd4c9f2 100755 (executable)
--- 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
                ;;