aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-04-09 08:03:08 +0000
committerSteven Barth <cyrus@openwrt.org>2013-04-09 08:03:08 +0000
commitea94d66b0fdb6a6853cd9ce8804c549fee6b553d (patch)
treeb1b411b81ea09041863013583c3a7e37e5b774f8
parent3e4b2af125af9d775fef7ce09820bd9199005e14 (diff)
downloadupstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.tar.gz
upstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.tar.bz2
upstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.zip
Adapt default network configuration for IPv6
SVN-Revision: 36278
-rw-r--r--package/base-files/files/etc/config/network8
-rw-r--r--package/base-files/files/lib/functions/uci-defaults.sh6
-rw-r--r--target/linux/adm5120/base-files/etc/config/network12
-rw-r--r--target/linux/adm8668/base-files/etc/config/network8
-rw-r--r--target/linux/amazon/base-files/etc/config/network4
-rw-r--r--target/linux/ar7/base-files/etc/config/network8
-rw-r--r--target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network8
-rw-r--r--target/linux/iop32x/base-files/etc/config/network5
-rw-r--r--target/linux/kirkwood/base-files/etc/uci-defaults/02_network4
-rwxr-xr-xtarget/linux/lantiq/base-files/etc/uci-defaults/02_network4
-rw-r--r--target/linux/mcs814x/base-files/etc/config/network8
-rw-r--r--target/linux/orion/base-files/etc/config/network8
-rw-r--r--target/linux/rb532/base-files/etc/config/network8
-rw-r--r--target/linux/x86/alix2/base-files/etc/config/network8
-rw-r--r--target/linux/x86/base-files/etc/defconfig/net4801/network8
-rw-r--r--target/linux/x86/geos/base-files/etc/config/network9
-rw-r--r--target/linux/x86/net5501/base-files/etc/config/network8
-rw-r--r--target/linux/x86/olpc/base-files/etc/config/network5
-rw-r--r--target/linux/x86/rdc/base-files/etc/config/network8
19 files changed, 137 insertions, 0 deletions
diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
index a35fd2ef9a..f2afcd9702 100644
--- 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 477c00cfd4..959ae5eba6 100644
--- 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 df2f201053..8516e2d020 100644
--- 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 120db236f7..42f37e4979 100644
--- 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 72e39f88a4..167a5f8b5a 100644
--- 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 0576aa437b..50a1edfb47 100644
--- 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 69d7dc712b..f2b3953851 100644
--- 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 1d9b55b2d3..2c3ca87e9b 100644
--- 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 48c1232d3d..8c04fdbf28 100644
--- 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 1eadb5687b..006f1bcc45 100755
--- 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 e24e824293..717f0482d8 100644
--- 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 e7fdecd0e0..644cbac5db 100644
--- 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 ee09491c79..6d963cd5b9 100644
--- 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 b46423fe15..9d70100add 100644
--- 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 ff7b42d875..4cbae10900 100644
--- 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 f49838318b..c9c12e3ce9 100644
--- 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 c0b6230d58..37b73d1e59 100644
--- 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 faa8f0e782..dc0bee1ee7 100644
--- 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 44c57940e2..2632d88e3f 100644
--- 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