Adapt default network configuration for IPv6

SVN-Revision: 36278

diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
index a35fd2ef9a1532a1fa7f8b3d53e83ca25ff620ca..f2afcd97023bb84fe99145ba4d6fcb4e16bab4c0 100644 (file)
--- a/package/base-files/files/etc/config/network
+++ b/package/base-files/files/etc/config/network
@@ -12,3 +12,11 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
+
+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 477c00cfd437eb6ad0481464f398e7e280997608..959ae5eba6f34fec131c81f2409f3fe745080f07 100644 (file)
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -150,6 +150,8 @@ set network.loopback.ifname='lo'
 set network.loopback.proto='static'
 set network.loopback.ipaddr='127.0.0.1'
 set network.loopback.netmask='255.0.0.0'
+set network.globals='globals'
+set network.globals.ula_prefix='auto'
 EOF
 }
 
@@ -174,6 +176,7 @@ set network.lan.type='bridge'
 set network.lan.proto='static'
 set network.lan.ipaddr='192.168.1.1'
 set network.lan.netmask='255.255.255.0'
+set network.lan.ip6assign='64'
 EOF
 }
 
@@ -184,6 +187,9 @@ ucidef_set_interface_wan() {
 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.proto='dhcpv6'
 EOF
 }
 

diff --git a/target/linux/adm5120/base-files/etc/config/network b/target/linux/adm5120/base-files/etc/config/network
index df2f201053036f9018a379e9f398f750cce46672..8516e2d0205e7dd9dbb120ea229a141332be3438 100644 (file)
--- a/target/linux/adm5120/base-files/etc/config/network
+++ b/target/linux/adm5120/base-files/etc/config/network
@@ -19,9 +19,21 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 
 #### WAN configuration
 config interface       wan
        option ifname   "eth1"
        option proto    dhcp
+
+
+#### WAN6 configuration
+config interface       wan6
+       option ifname   "@wan"
+       option proto    dhcpv6
+
+
+#### Network global configuration
+config globals         globals
+       option ula_prefix auto

diff --git a/target/linux/adm8668/base-files/etc/config/network b/target/linux/adm8668/base-files/etc/config/network
index 120db236f78cc8d3fc436dd7287ccebca03796fb..42f37e497936b97eccc2a61da8bd1dde05f9259d 100644 (file)
--- a/target/linux/adm8668/base-files/etc/config/network
+++ b/target/linux/adm8668/base-files/etc/config/network
@@ -10,7 +10,15 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config interface wan
        option ifname   eth1
        option proto    dhcp
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/amazon/base-files/etc/config/network b/target/linux/amazon/base-files/etc/config/network
index 72e39f88a49aeef6b45c5b11c7fd969206a62f8b..167a5f8b5a2fbbaa6bee5f9799467a4db5aed948 100644 (file)
--- a/target/linux/amazon/base-files/etc/config/network
+++ b/target/linux/amazon/base-files/etc/config/network
@@ -12,3 +12,7 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/ar7/base-files/etc/config/network b/target/linux/ar7/base-files/etc/config/network
index 0576aa437b9df628c677e4d820a22434be680021..50a1edfb47431e4869d1b6dae5142ef1e31f6625 100644 (file)
--- a/target/linux/ar7/base-files/etc/config/network
+++ b/target/linux/ar7/base-files/etc/config/network
@@ -13,6 +13,14 @@ config interface lan
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
        option nat      1
+       option ip6assign 64
+
+config interface wan6
+        option ifname   @wan
+        option proto    dhcpv6
+
+config globals globals
+        option ula_prefix auto
 
 ## Example for ATM bridging.
 ## Useful for PPPoE or IP over ATM. Will create 'nas${unit}'

diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
index 69d7dc712b7ff6bc6482cbd1c21c23813814eb39..f2b395385153d86a3de8b87b91534de0b6bd0b67 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
+++ b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network
@@ -10,11 +10,19 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config interface wan
        option ifname   eth1
        option proto    dhcp
 
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto
+
 config switch
        option name     rtl8366s
        option reset    1

diff --git a/target/linux/iop32x/base-files/etc/config/network b/target/linux/iop32x/base-files/etc/config/network
index 1d9b55b2d31b65501f14cb3556e6c1ff1fe82f4a..2c3ca87e9b4c68462c5f6032a79599010ed20c96 100644 (file)
--- a/target/linux/iop32x/base-files/etc/config/network
+++ b/target/linux/iop32x/base-files/etc/config/network
@@ -9,3 +9,8 @@ config interface loopback
 config interface lan
        option ifname   eth0
        option proto    dhcp
+
+config interface lan6
+       option ifname   @lan
+       option proto    dhcpv6
+       option reqprefix no

diff --git a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
index 48c1232d3d5fc670a8f9295684fd98703c07c9cc..8c04fdbf2856f42f9d93e509863233ce1736d1b1 100644 (file)
--- a/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
+++ b/target/linux/kirkwood/base-files/etc/uci-defaults/02_network
@@ -11,6 +11,10 @@ set_lan_dhcp() {
 set network.lan='interface'
 set network.lan.ifname='$ifname'
 set network.lan.proto='dhcp'
+set network.lan6='interface'
+set network.lan6.ifname='@lan'
+set network.lan6.proto='dhcpv6'
+set network.lan6.reqprefix='no'
 EOF
 }
 

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index 1eadb5687b643eb2ff2604fc061b3b73e11a318e..006f1bcc454c074783ce6581eaa5238cb86ac372 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -21,6 +21,10 @@ set network.wan.ifname='nas0'
 set network.wan.proto='pppoe'
 set network.wan.username='foo'
 set network.wan.password='bar'
+set network.wan.ipv6='1'
+set network.wan6='interface'
+set network.wan6.ifname='@wan'
+set network.wan6.proto='dhcpv6'
 EOF
 }
 

diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network
index e24e824293c01c20645a8e1a4765181b006675cc..717f0482d8ccac8b193a80ad612c1ef8132faec6 100644 (file)
--- a/target/linux/mcs814x/base-files/etc/config/network
+++ b/target/linux/mcs814x/base-files/etc/config/network
@@ -11,3 +11,11 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/orion/base-files/etc/config/network b/target/linux/orion/base-files/etc/config/network
index e7fdecd0e01d4e33fb4a7b564dba03be4beb2e3b..644cbac5db68b3dcde797696fe548cfd382eec8c 100644 (file)
--- a/target/linux/orion/base-files/etc/config/network
+++ b/target/linux/orion/base-files/etc/config/network
@@ -20,3 +20,11 @@ config interface lan
         option proto    static
         option ipaddr   192.168.1.1
         option netmask  255.255.255.0
+       option ip6assign 64
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/rb532/base-files/etc/config/network b/target/linux/rb532/base-files/etc/config/network
index ee09491c793dfa152fe7c957c71efc0536285b4d..6d963cd5b9548c4d8179b830a0316eb23d09e566 100644 (file)
--- a/target/linux/rb532/base-files/etc/config/network
+++ b/target/linux/rb532/base-files/etc/config/network
@@ -11,3 +11,11 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/x86/alix2/base-files/etc/config/network b/target/linux/x86/alix2/base-files/etc/config/network
index b46423fe156d8834015fec298fea3dd1e7817802..9d70100add82098f13919c3275563833242c3411 100644 (file)
--- a/target/linux/x86/alix2/base-files/etc/config/network
+++ b/target/linux/x86/alix2/base-files/etc/config/network
@@ -14,7 +14,15 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config interface wan
        option ifname   eth0
        option proto    dhcp
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network
index ff7b42d8752bec428b624455fcac6dd3da81ef46..4cbae109005c33f2e281d20cfdd6b1f45fd6ad70 100644 (file)
--- a/target/linux/x86/base-files/etc/defconfig/net4801/network
+++ b/target/linux/x86/base-files/etc/defconfig/net4801/network
@@ -10,7 +10,15 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config interface wan
        option ifname   eth0
        option proto    dhcp
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/x86/geos/base-files/etc/config/network b/target/linux/x86/geos/base-files/etc/config/network
index f49838318b05dd73c592db10e5e9ce6181934d96..c9c12e3ce9d2f469bed31839dbc622cda372c9b2 100644 (file)
--- a/target/linux/x86/geos/base-files/etc/config/network
+++ b/target/linux/x86/geos/base-files/etc/config/network
@@ -12,6 +12,7 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config atm-bridge
        option unit     0
@@ -28,6 +29,14 @@ config interface wan
        # clone your eth0 address here
        # option macaddr '00:0A:FA:22:00:80'
 
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto
+
+
 # 2nd interface on Geos2
 #config interface wan
 #      option proto    pppoa

diff --git a/target/linux/x86/net5501/base-files/etc/config/network b/target/linux/x86/net5501/base-files/etc/config/network
index c0b6230d58e0c1fd502655907ba042dc3fdba8fd..37b73d1e598161162b4c2e7c26a33a4a610f2ed6 100644 (file)
--- a/target/linux/x86/net5501/base-files/etc/config/network
+++ b/target/linux/x86/net5501/base-files/etc/config/network
@@ -12,7 +12,15 @@ config interface lan
        option proto    static
        option ipaddr   192.168.1.1
        option netmask  255.255.255.0
+       option ip6assign 64
 
 config interface wan
        option ifname   eth0
        option proto    dhcp
+
+config interface wan6
+       option ifname   @wan
+       option proto    dhcpv6
+
+config globals globals
+       option ula_prefix auto

diff --git a/target/linux/x86/olpc/base-files/etc/config/network b/target/linux/x86/olpc/base-files/etc/config/network
index faa8f0e7829ba4eb1cc023477f3d6221a032a8f0..dc0bee1ee7f108d61301388d748158b88507762b 100644 (file)
--- a/target/linux/x86/olpc/base-files/etc/config/network
+++ b/target/linux/x86/olpc/base-files/etc/config/network
@@ -9,3 +9,8 @@ config interface loopback
 config interface wlan
         option ifname   eth0
         option proto    dhcp
+
+config interface wlan6
+        option ifname   @wlan
+        option proto    dhcpv6
+        option reqprefix no

diff --git a/target/linux/x86/rdc/base-files/etc/config/network b/target/linux/x86/rdc/base-files/etc/config/network
index 44c57940e25ce32e848bd6a3b1137df76da9eca8..2632d88e3f739caf0f1309ea85c6b166f5c6d41a 100644 (file)
--- a/target/linux/x86/rdc/base-files/etc/config/network
+++ b/target/linux/x86/rdc/base-files/etc/config/network
@@ -12,7 +12,15 @@ config interface lan
         option proto    static
         option ipaddr   192.168.1.1
         option netmask  255.255.255.0
+        option ip6assign 64
 
 config interface wan
        option ifname   eth0
        option proto    dhcp
+
+config interface wan6
+        option ifname   @wan
+        option proto    dhcpv6
+
+config globals globals
+        option ula_prefix auto