aboutsummaryrefslogtreecommitdiffstats
path: root/package
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 /package
parent3e4b2af125af9d775fef7ce09820bd9199005e14 (diff)
downloadupstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.tar.gz
upstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.tar.bz2
upstream-ea94d66b0fdb6a6853cd9ce8804c549fee6b553d.zip
Adapt default network configuration for IPv6
SVN-Revision: 36278
Diffstat (limited to 'package')
-rw-r--r--package/base-files/files/etc/config/network8
-rw-r--r--package/base-files/files/lib/functions/uci-defaults.sh6
2 files changed, 14 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
}