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/x86/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/x86/base-files')
3 files changed, 9 insertions, 14 deletions
diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/defconfig/net4801/network index ff7b42d87..172d51315 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 60 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/lib/preinit/15_essential_fs_x86 b/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 index ba22849d1..5d5453093 100644 --- a/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 +++ b/target/linux/x86/base-files/lib/preinit/15_essential_fs_x86 @@ -3,6 +3,6 @@ # Copyright (C) 2010 Vertical Communications do_mount_procfs() { - mount -t proc none /proc + mount -o noatime -t proc none /proc } diff --git a/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 b/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 deleted file mode 100644 index 2ca039cbd..000000000 --- a/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -failsafe_wait() { - FAILSAFE= - grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE - if [ "$FAILSAFE" != "true" ]; then - preinit_net_echo "Please press button now to enter failsafe" - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE - fi -} - |