diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /target/linux/mcs814x/base-files | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'target/linux/mcs814x/base-files')
| -rw-r--r-- | target/linux/mcs814x/base-files/etc/config/network | 8 | ||||
| -rw-r--r-- | target/linux/mcs814x/base-files/etc/uci-defaults/01_leds (renamed from target/linux/mcs814x/base-files/etc/uci-defaults/leds) | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/target/linux/mcs814x/base-files/etc/config/network b/target/linux/mcs814x/base-files/etc/config/network index e24e82429..e2f779e7b 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 60 + +config interface wan6 + option ifname @wan + option proto dhcpv6 + +config globals globals + option ula_prefix auto diff --git a/target/linux/mcs814x/base-files/etc/uci-defaults/leds b/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds index 8ab8b4e76..8ab8b4e76 100644 --- a/target/linux/mcs814x/base-files/etc/uci-defaults/leds +++ b/target/linux/mcs814x/base-files/etc/uci-defaults/01_leds |