Selaa lähdekoodia

network: Unbind DHCPv6 from underlying interfaces

This allows IPv6 to set up without IPv4 being up thus
IPv6-only or IPv6+DS-Lite working with the default config.

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

SVN-Revision: 42848
Steven Barth 11 vuotta sitten
vanhempi
sitoutus
c118e5edf4

+ 1 - 1
package/base-files/files/bin/config_generate

@@ -62,7 +62,7 @@ EOF
 set network.$1.proto='dhcp'
 delete network.wan6
 set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
 set network.wan6.proto='dhcpv6'
 EOF
 		;;

+ 0 - 4
package/base-files/files/etc/config/network

@@ -14,9 +14,5 @@ config interface lan
 	option netmask	255.255.255.0
 	option ip6assign 60
 
-config interface wan6
-	option ifname	@wan
-	option proto	dhcpv6
-
 config globals globals
 	option ula_prefix auto

+ 1 - 1
package/base-files/files/lib/functions/uci-defaults.sh

@@ -190,7 +190,7 @@ set network.wan='interface'
 set network.wan.ifname='$ifname'
 set network.wan.proto='dhcp'
 set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
 set network.wan6.proto='dhcpv6'
 EOF
 }

+ 1 - 1
target/linux/adm5120/base-files/etc/config/network

@@ -30,7 +30,7 @@ config interface	wan
 
 #### WAN6 configuration
 config interface	wan6
-	option ifname	"@wan"
+	option ifname	"eth1"
 	option proto	dhcpv6
 
 

+ 1 - 1
target/linux/adm8668/base-files/etc/config/network

@@ -17,7 +17,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth1
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/mcs814x/base-files/etc/config/network

@@ -14,7 +14,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/orion/base-files/etc/uci-defaults/10-network

@@ -29,7 +29,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   wan
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/rb532/base-files/etc/config/network

@@ -18,7 +18,7 @@ config interface lan
 	option ip6assign 60
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/x86/alix2/base-files/etc/config/network

@@ -21,7 +21,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/x86/base-files/etc/defconfig/net4801/network

@@ -17,7 +17,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/x86/geos/base-files/etc/config/network

@@ -30,7 +30,7 @@ config interface wan
 	# option macaddr '00:0A:FA:22:00:80'
 
 config interface wan6
-	option ifname   @wan
+	option ifname   nas0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/x86/net5501/base-files/etc/config/network

@@ -19,7 +19,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-	option ifname   @wan
+	option ifname   eth0
 	option proto    dhcpv6
 
 config globals globals

+ 1 - 1
target/linux/x86/rdc/base-files/etc/config/network

@@ -19,7 +19,7 @@ config interface wan
 	option proto	dhcp
 
 config interface wan6
-        option ifname   @wan
+        option ifname   eth0
         option proto    dhcpv6
 
 config globals globals