Просмотр исходного кода

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

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 42888
Felix Fietkau 11 лет назад
Родитель
Сommit
d2b08fb4ab

+ 7 - 5
target/linux/x86/base-files/etc/defconfig/net4801/network → target/linux/x86/base-files/etc/config/network

@@ -1,3 +1,5 @@
+# Copyright (C) 2006 OpenWrt.org
+
 config interface loopback
 	option ifname	lo
 	option proto	static
@@ -5,20 +7,20 @@ config interface loopback
 	option netmask	255.0.0.0
 
 config interface lan
-	option ifname	eth1
-	option type	bridge
+	option ifname	eth0
+	option type 	bridge
 	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 ifname	eth1
 	option proto	dhcp
 
 config interface wan6
-	option ifname   eth0
-	option proto    dhcpv6
+	option ifname	eth1
+	option proto	dhcpv6
 
 config globals globals
 	option ula_prefix auto

+ 0 - 12
target/linux/x86/base-files/etc/defconfig/net4826/network

@@ -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

+ 0 - 20
target/linux/x86/base-files/etc/init.d/defconfig

@@ -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
-}

+ 0 - 19
target/linux/x86/base-files/lib/soekris.sh

@@ -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
-}