From: Steven Barth Date: Mon, 22 Apr 2013 19:40:16 +0000 (+0000) Subject: Change default IPv6 config to enable DHCPv6-PD X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e8f7f37edc7c0e1088d002cbb16f76509f4151c;p=openwrt%2Fstaging%2Fyousong.git Change default IPv6 config to enable DHCPv6-PD SVN-Revision: 36384 --- diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network index f2afcd9702..87b124aa3b 100644 --- a/package/base-files/files/etc/config/network +++ b/package/base-files/files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh index 959ae5eba6..bf6fe1e305 100644 --- a/package/base-files/files/lib/functions/uci-defaults.sh +++ b/package/base-files/files/lib/functions/uci-defaults.sh @@ -176,7 +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' +set network.lan.ip6assign='60' EOF } diff --git a/target/linux/adm5120/base-files/etc/config/network b/target/linux/adm5120/base-files/etc/config/network index 8516e2d020..9c52c0e394 100644 --- a/target/linux/adm5120/base-files/etc/config/network +++ b/target/linux/adm5120/base-files/etc/config/network @@ -19,7 +19,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 #### WAN configuration diff --git a/target/linux/adm8668/base-files/etc/config/network b/target/linux/adm8668/base-files/etc/config/network index 42f37e4979..2b53cf6c5d 100644 --- a/target/linux/adm8668/base-files/etc/config/network +++ b/target/linux/adm8668/base-files/etc/config/network @@ -10,7 +10,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth1 diff --git a/target/linux/amazon/base-files/etc/config/network b/target/linux/amazon/base-files/etc/config/network index 167a5f8b5a..9745944bab 100644 --- a/target/linux/amazon/base-files/etc/config/network +++ b/target/linux/amazon/base-files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 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 50a1edfb47..968d955e75 100644 --- a/target/linux/ar7/base-files/etc/config/network +++ b/target/linux/ar7/base-files/etc/config/network @@ -13,7 +13,7 @@ config interface lan option ipaddr 192.168.1.1 option netmask 255.255.255.0 option nat 1 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan diff --git a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network index f2b3953851..ad05525d2c 100644 --- a/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network +++ b/target/linux/ar71xx/base-files/etc/defconfig/wndr3700/network @@ -10,7 +10,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth1 diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network index 717f0482d8..e2f779e7ba 100644 --- a/target/linux/mcs814x/base-files/etc/config/network +++ b/target/linux/mcs814x/base-files/etc/config/network @@ -11,7 +11,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan diff --git a/target/linux/orion/base-files/etc/config/network b/target/linux/orion/base-files/etc/config/network index 644cbac5db..b527a88769 100644 --- a/target/linux/orion/base-files/etc/config/network +++ b/target/linux/orion/base-files/etc/config/network @@ -20,7 +20,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan diff --git a/target/linux/rb532/base-files/etc/config/network b/target/linux/rb532/base-files/etc/config/network index 6d963cd5b9..3a8c8f30b3 100644 --- a/target/linux/rb532/base-files/etc/config/network +++ b/target/linux/rb532/base-files/etc/config/network @@ -11,7 +11,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan6 option ifname @wan diff --git a/target/linux/x86/alix2/base-files/etc/config/network b/target/linux/x86/alix2/base-files/etc/config/network index 9d70100add..505628e949 100644 --- a/target/linux/x86/alix2/base-files/etc/config/network +++ b/target/linux/x86/alix2/base-files/etc/config/network @@ -14,7 +14,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth0 diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network index 4cbae10900..172d513159 100644 --- a/target/linux/x86/base-files/etc/defconfig/net4801/network +++ b/target/linux/x86/base-files/etc/defconfig/net4801/network @@ -10,7 +10,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth0 diff --git a/target/linux/x86/geos/base-files/etc/config/network b/target/linux/x86/geos/base-files/etc/config/network index c9c12e3ce9..a60fcdf28d 100644 --- a/target/linux/x86/geos/base-files/etc/config/network +++ b/target/linux/x86/geos/base-files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config atm-bridge option unit 0 diff --git a/target/linux/x86/net5501/base-files/etc/config/network b/target/linux/x86/net5501/base-files/etc/config/network index 37b73d1e59..330c60b324 100644 --- a/target/linux/x86/net5501/base-files/etc/config/network +++ b/target/linux/x86/net5501/base-files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth0 diff --git a/target/linux/x86/rdc/base-files/etc/config/network b/target/linux/x86/rdc/base-files/etc/config/network index 2632d88e3f..9ee12dc008 100644 --- a/target/linux/x86/rdc/base-files/etc/config/network +++ b/target/linux/x86/rdc/base-files/etc/config/network @@ -12,7 +12,7 @@ config interface lan option proto static option ipaddr 192.168.1.1 option netmask 255.255.255.0 - option ip6assign 64 + option ip6assign 60 config interface wan option ifname eth0