KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: remove old soekris config hacks, install a more appropriate default /etc/config/network with lan+wan

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42888
This commit is contained in:
Felix Fietkau 2014-10-12 20:25:30 +00:00
parent 4c490c79b2
commit d2b08fb4ab
4 changed files with 7 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/x86/base-files/etc/defconfig/net4801/network → target/linux/x86/base-files/etc/config/network
View file

@ -1,3 +1,5 @@
# Copyright (C) 2006 OpenWrt.org
config interface loopback config interface loopback
option ifname lo option ifname lo
option proto static option proto static
@ -5,20 +7,20 @@ config interface loopback
option netmask 255.0.0.0 option netmask 255.0.0.0
config interface lan config interface lan
option ifname eth1 option ifname eth0
option type bridge option type bridge
option proto static option proto static
option ipaddr 192.168.1.1 option ipaddr 192.168.1.1
option netmask 255.255.255.0 option netmask 255.255.255.0
option ip6assign 60 option ip6assign 60
config interface wan config interface wan
option ifname eth0 option ifname eth1
option proto dhcp option proto dhcp
config interface wan6 config interface wan6
option ifname eth0 option ifname eth1
option proto dhcpv6 option proto dhcpv6
config globals globals config globals globals
option ula_prefix auto option ula_prefix auto

12
target/linux/x86/base-files/etc/defconfig/net4826/network
View file

@ -1,12 +0,0 @@
config interface loopback
option ifname lo
option proto static
option ipaddr 127.0.0.1
option netmask 255.0.0.0
config interface lan
option ifname eth0
option type bridge
option proto static
option ipaddr 192.168.1.1
option netmask 255.255.255.0

20
target/linux/x86/base-files/etc/init.d/defconfig
View file

@ -1,20 +0,0 @@
#!/bin/sh /etc/rc.common
#
# Copyright (C) 2010 Thinktube Inc.
#
START=05
start() {
. /lib/soekris.sh
local board=$(net48xx_board_name)
[ ! -d /etc/defconfig/$board ] && board="net4826"
for f in $( ls /etc/defconfig/$board ); do
if [ ! -e /etc/config/$f ]; then
cp /etc/defconfig/$board/$f /etc/config/
fi
done
}

19
target/linux/x86/base-files/lib/soekris.sh
View file

@ -1,19 +0,0 @@
#!/bin/sh
net48xx_board_name () {
local name
local pci=`wc -l /proc/bus/pci/devices`
case "$pci" in
*"8"*)
name="net4826"
;;
*1[0-4]*)
name="net4801"
;;
*)
name="net4826"
;;
esac
echo $name
}