aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-12 20:25:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-12 20:25:30 +0000
commitcc8b4b8143480d5343dc0ae553767527d6a2e0c7 (patch)
tree67f0d0a138cac58a6a5b768e74b5416fcb3ddadf /target
parent55fe29b1b9bf4582d725a2436ee389a39d650cf1 (diff)
downloadupstream-cc8b4b8143480d5343dc0ae553767527d6a2e0c7.tar.gz
upstream-cc8b4b8143480d5343dc0ae553767527d6a2e0c7.tar.bz2
upstream-cc8b4b8143480d5343dc0ae553767527d6a2e0c7.zip
x86: remove old soekris config hacks, install a more appropriate default /etc/config/network with lan+wan
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42888 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/base-files/etc/config/network (renamed from target/linux/x86/base-files/etc/defconfig/net4801/network)12
-rw-r--r--target/linux/x86/base-files/etc/defconfig/net4826/network12
-rwxr-xr-xtarget/linux/x86/base-files/etc/init.d/defconfig20
-rwxr-xr-xtarget/linux/x86/base-files/lib/soekris.sh19
4 files changed, 7 insertions, 56 deletions
diff --git a/target/linux/x86/base-files/etc/defconfig/net4801/network b/target/linux/x86/base-files/etc/config/network
index 6821c807d0..c9953a0249 100644
--- a/target/linux/x86/base-files/etc/defconfig/net4801/network
+++ b/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
diff --git a/target/linux/x86/base-files/etc/defconfig/net4826/network b/target/linux/x86/base-files/etc/defconfig/net4826/network
deleted file mode 100644
index 7c9fb63637..0000000000
--- a/target/linux/x86/base-files/etc/defconfig/net4826/network
+++ /dev/null
@@ -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
diff --git a/target/linux/x86/base-files/etc/init.d/defconfig b/target/linux/x86/base-files/etc/init.d/defconfig
deleted file mode 100755
index 4b4f28f20d..0000000000
--- a/target/linux/x86/base-files/etc/init.d/defconfig
+++ /dev/null
@@ -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
-}
diff --git a/target/linux/x86/base-files/lib/soekris.sh b/target/linux/x86/base-files/lib/soekris.sh
deleted file mode 100755
index e416ad3962..0000000000
--- a/target/linux/x86/base-files/lib/soekris.sh
+++ /dev/null
@@ -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
-}