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 <steven@midlink.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42848 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 3f60c5b..9a3b300 100755 (executable)
--- a/package/base-files/files/bin/config_generate
+++ b/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
                ;;

diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
index 3c9c30a..d3cd3c6 100644 (file)
--- a/package/base-files/files/etc/config/network
+++ b/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

diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index e90090c..798d6ba 100644 (file)
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/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
 }

diff --git a/target/linux/adm5120/base-files/etc/config/network b/target/linux/adm5120/base-files/etc/config/network
index 9c52c0e..87782f4 100644 (file)
--- a/target/linux/adm5120/base-files/etc/config/network
+++ b/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
 
 

diff --git a/target/linux/adm8668/base-files/etc/config/network b/target/linux/adm8668/base-files/etc/config/network
index 2b53cf6..5967cdd 100644 (file)
--- a/target/linux/adm8668/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
index e2f779e..cec7b25 100644 (file)
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/orion/base-files/etc/uci-defaults/10-network b/target/linux/orion/base-files/etc/uci-defaults/10-network
index 3baa679..5d5a585 100644 (file)
--- a/target/linux/orion/base-files/etc/uci-defaults/10-network
+++ b/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

diff --git a/target/linux/rb532/base-files/etc/config/network b/target/linux/rb532/base-files/etc/config/network
index 1153799..75a14a7 100644 (file)
--- a/target/linux/rb532/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/x86/alix2/base-files/etc/config/network b/target/linux/x86/alix2/base-files/etc/config/network
index 505628e..4683402 100644 (file)
--- a/target/linux/x86/alix2/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network
index 172d513..6821c80 100644 (file)
--- a/target/linux/x86/base-files/etc/defconfig/net4801/network
+++ b/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

diff --git a/target/linux/x86/geos/base-files/etc/config/network b/target/linux/x86/geos/base-files/etc/config/network
index a60fcdf..d12d528 100644 (file)
--- a/target/linux/x86/geos/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/x86/net5501/base-files/etc/config/network b/target/linux/x86/net5501/base-files/etc/config/network
index 330c60b..4aa8096 100644 (file)
--- a/target/linux/x86/net5501/base-files/etc/config/network
+++ b/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

diff --git a/target/linux/x86/rdc/base-files/etc/config/network b/target/linux/x86/rdc/base-files/etc/config/network
index 9ee12dc..69627f7 100644 (file)
--- a/target/linux/x86/rdc/base-files/etc/config/network
+++ b/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