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

diff --git a/package/base-files/ar7-2.4/etc/config/network b/package/base-files/ar7-2.4/etc/config/network
index 19a858e163bb30df71eb55424ab704658e42f5c4..911134bb0df68b3ac1717f9d8e23f7eaeef57779 100644 (file)
--- 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 aadd4aa8ed033a8ea679af8682955cd41457fff9..1d9b55b2d31b65501f14cb3556e6c1ff1fe82f4a 100644 (file)
--- 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 448ab7c9d3a0f5ace0d9364ade71c3102796b2cc..9b65652f06be39a753fe1eb50a0a0b6eb166f706 100644 (file)
--- 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 2efd596aa8e50cec7f08925612be81c54b0a119c..175b9a98361b008a05416fbaf012184877b52839 100755 (executable)
--- 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 2efd596aa8e50cec7f08925612be81c54b0a119c..175b9a98361b008a05416fbaf012184877b52839 100755 (executable)
--- 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 19420eda530e67be0e542cb19ce8ebb41568d380..34f4cea93430ba1c45696e684ea31da57d501d47 100755 (executable)
--- 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 ec05c3eb818d271267a192de82abdd2d8c2b6f1a..bb58a3e751dd66f929eeb7515c9e5f88c5991027 100755 (executable)
--- 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 6f089fe992628e6f068d6aa37a2c5272b807696a..82796905741150ab33f492e33d76cf64b04be3a7 100644 (file)
--- 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 448ab7c9d3a0f5ace0d9364ade71c3102796b2cc..9b65652f06be39a753fe1eb50a0a0b6eb166f706 100644 (file)
--- 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 f1ed977450735be2949ef71cba1dd041992eb098..68d8e4240e69c2ceb672329accbe7842859c4532 100644 (file)
--- 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 f1ed977450735be2949ef71cba1dd041992eb098..68d8e4240e69c2ceb672329accbe7842859c4532 100644 (file)
--- 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 aadd4aa8ed033a8ea679af8682955cd41457fff9..1d9b55b2d31b65501f14cb3556e6c1ff1fe82f4a 100644 (file)
--- 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