summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-27 11:11:55 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-08-27 11:11:55 +0000
commit465de48141a686fc4915fa816a24b976fa00a5bd (patch)
tree1214bf14d4fd428e3f8eca52a1dce8fa03626fb1
parentf7d68e0a92d2978712aa6ebf610a300f5818948a (diff)
fix minor typo & move loopback to network config
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4683 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/ar7-2.4/etc/config/network6
-rw-r--r--package/base-files/aruba-2.6/etc/config/network6
-rw-r--r--package/base-files/au1000-2.6/etc/config/network6
-rwxr-xr-xpackage/base-files/brcm-2.4/etc/init.d/S05netconfig8
-rwxr-xr-xpackage/base-files/brcm-2.6/etc/init.d/S05netconfig8
-rwxr-xr-xpackage/base-files/default/etc/init.d/S10boot4
-rwxr-xr-xpackage/base-files/default/lib/network/config.sh2
-rw-r--r--package/base-files/rb532-2.6/etc/config/network6
-rw-r--r--package/base-files/sibyte-2.6/etc/config/network6
-rw-r--r--package/base-files/x86-2.4/etc/config/network6
-rw-r--r--package/base-files/x86-2.6/etc/config/network6
-rw-r--r--package/base-files/xscale-2.6/etc/config/network6
12 files changed, 65 insertions, 5 deletions
diff --git a/package/base-files/ar7-2.4/etc/config/network b/package/base-files/ar7-2.4/etc/config/network
index 19a858e16..911134bb0 100644
--- a/package/base-files/ar7-2.4/etc/config/network
+++ b/package/base-files/ar7-2.4/etc/config/network
@@ -1,5 +1,11 @@
# Network configuration file
+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 proto static
diff --git a/package/base-files/aruba-2.6/etc/config/network b/package/base-files/aruba-2.6/etc/config/network
index aadd4aa8e..1d9b55b2d 100644
--- a/package/base-files/aruba-2.6/etc/config/network
+++ b/package/base-files/aruba-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Network configuration file
+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 proto dhcp
diff --git a/package/base-files/au1000-2.6/etc/config/network b/package/base-files/au1000-2.6/etc/config/network
index 448ab7c9d..9b65652f0 100644
--- a/package/base-files/au1000-2.6/etc/config/network
+++ b/package/base-files/au1000-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Copyright (C) 2006 OpenWrt.org
+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 type bridge
option ifname "eth0 ath0"
diff --git a/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
index 2efd596aa..175b9a983 100755
--- a/package/base-files/brcm-2.4/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.4/etc/init.d/S05netconfig
@@ -61,6 +61,14 @@ END {
p("vlan1", "vlan1ports")
print ""
print ""
+ print "#### Loopback configuration"
+ print "config interface loopback"
+ print " option ifname \"lo\""
+ print " option proto static"
+ print " option ipaddr 127.0.0.1"
+ print " option netmask 255.0.0.0"
+ print ""
+ print ""
print "#### LAN configuration"
print "config interface lan"
print " option type bridge"
diff --git a/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
index 2efd596aa..175b9a983 100755
--- a/package/base-files/brcm-2.6/etc/init.d/S05netconfig
+++ b/package/base-files/brcm-2.6/etc/init.d/S05netconfig
@@ -61,6 +61,14 @@ END {
p("vlan1", "vlan1ports")
print ""
print ""
+ print "#### Loopback configuration"
+ print "config interface loopback"
+ print " option ifname \"lo\""
+ print " option proto static"
+ print " option ipaddr 127.0.0.1"
+ print " option netmask 255.0.0.0"
+ print ""
+ print ""
print "#### LAN configuration"
print "config interface lan"
print " option type bridge"
diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 19420eda5..34f4cea93 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -22,7 +22,3 @@ for iface in $(/sbin/ifconfig -a | awk '{print $1}' | grep eth); do
done
load_modules /etc/modules /etc/modules.d/*
-
-ifconfig lo 127.0.0.1 up
-ifconfig eth0 promisc
-
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index ec05c3eb8..bb58a3e75 100755
--- a/package/base-files/default/lib/network/config.sh
+++ b/package/base-files/default/lib/network/config.sh
@@ -32,7 +32,7 @@ scan_interfaces() {
interface)
config_get proto "$CONFIG_SECTION" proto
append interfaces "$CONFIG_SECTION"
- config_get iftype "$CONFIG_SECTION" iftype
+ config_get iftype "$CONFIG_SECTION" type
case "$iftype" in
bridge)
config_get ifname "$CONFIG_SECTION" ifname
diff --git a/package/base-files/rb532-2.6/etc/config/network b/package/base-files/rb532-2.6/etc/config/network
index 6f089fe99..827969057 100644
--- a/package/base-files/rb532-2.6/etc/config/network
+++ b/package/base-files/rb532-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Copyright (C) 2006 OpenWrt.org
+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 proto dhcp
diff --git a/package/base-files/sibyte-2.6/etc/config/network b/package/base-files/sibyte-2.6/etc/config/network
index 448ab7c9d..9b65652f0 100644
--- a/package/base-files/sibyte-2.6/etc/config/network
+++ b/package/base-files/sibyte-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Copyright (C) 2006 OpenWrt.org
+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 type bridge
option ifname "eth0 ath0"
diff --git a/package/base-files/x86-2.4/etc/config/network b/package/base-files/x86-2.4/etc/config/network
index f1ed97745..68d8e4240 100644
--- a/package/base-files/x86-2.4/etc/config/network
+++ b/package/base-files/x86-2.4/etc/config/network
@@ -1,5 +1,11 @@
# Copyright (C) 2006 OpenWrt.org
+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 type bridge
option ifname "eth1 eth2"
diff --git a/package/base-files/x86-2.6/etc/config/network b/package/base-files/x86-2.6/etc/config/network
index f1ed97745..68d8e4240 100644
--- a/package/base-files/x86-2.6/etc/config/network
+++ b/package/base-files/x86-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Copyright (C) 2006 OpenWrt.org
+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 type bridge
option ifname "eth1 eth2"
diff --git a/package/base-files/xscale-2.6/etc/config/network b/package/base-files/xscale-2.6/etc/config/network
index aadd4aa8e..1d9b55b2d 100644
--- a/package/base-files/xscale-2.6/etc/config/network
+++ b/package/base-files/xscale-2.6/etc/config/network
@@ -1,5 +1,11 @@
# Network configuration file
+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 proto dhcp