From b367cfb4e270dd4d377f258dc5a0d22d3743d883 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Sun, 27 Aug 2006 11:11:55 +0000 Subject: [PATCH] fix minor typo & move loopback to network config SVN-Revision: 4683 --- openwrt/package/base-files/ar7-2.4/etc/config/network | 6 ++++++ openwrt/package/base-files/aruba-2.6/etc/config/network | 6 ++++++ openwrt/package/base-files/au1000-2.6/etc/config/network | 6 ++++++ .../package/base-files/brcm-2.4/etc/init.d/S05netconfig | 8 ++++++++ .../package/base-files/brcm-2.6/etc/init.d/S05netconfig | 8 ++++++++ openwrt/package/base-files/default/etc/init.d/S10boot | 4 ---- openwrt/package/base-files/default/lib/network/config.sh | 2 +- openwrt/package/base-files/rb532-2.6/etc/config/network | 6 ++++++ openwrt/package/base-files/sibyte-2.6/etc/config/network | 6 ++++++ openwrt/package/base-files/x86-2.4/etc/config/network | 6 ++++++ openwrt/package/base-files/x86-2.6/etc/config/network | 6 ++++++ openwrt/package/base-files/xscale-2.6/etc/config/network | 6 ++++++ 12 files changed, 65 insertions(+), 5 deletions(-) diff --git a/openwrt/package/base-files/ar7-2.4/etc/config/network b/openwrt/package/base-files/ar7-2.4/etc/config/network index 19a858e163..911134bb0d 100644 --- a/openwrt/package/base-files/ar7-2.4/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/aruba-2.6/etc/config/network b/openwrt/package/base-files/aruba-2.6/etc/config/network index aadd4aa8ed..1d9b55b2d3 100644 --- a/openwrt/package/base-files/aruba-2.6/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/au1000-2.6/etc/config/network b/openwrt/package/base-files/au1000-2.6/etc/config/network index 448ab7c9d3..9b65652f06 100644 --- a/openwrt/package/base-files/au1000-2.6/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig index 2efd596aa8..175b9a9836 100755 --- a/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig +++ b/openwrt/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/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig index 2efd596aa8..175b9a9836 100755 --- a/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig +++ b/openwrt/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/openwrt/package/base-files/default/etc/init.d/S10boot b/openwrt/package/base-files/default/etc/init.d/S10boot index 19420eda53..34f4cea934 100755 --- a/openwrt/package/base-files/default/etc/init.d/S10boot +++ b/openwrt/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/openwrt/package/base-files/default/lib/network/config.sh b/openwrt/package/base-files/default/lib/network/config.sh index ec05c3eb81..bb58a3e751 100755 --- a/openwrt/package/base-files/default/lib/network/config.sh +++ b/openwrt/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/openwrt/package/base-files/rb532-2.6/etc/config/network b/openwrt/package/base-files/rb532-2.6/etc/config/network index 6f089fe992..8279690574 100644 --- a/openwrt/package/base-files/rb532-2.6/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/sibyte-2.6/etc/config/network b/openwrt/package/base-files/sibyte-2.6/etc/config/network index 448ab7c9d3..9b65652f06 100644 --- a/openwrt/package/base-files/sibyte-2.6/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/x86-2.4/etc/config/network b/openwrt/package/base-files/x86-2.4/etc/config/network index f1ed977450..68d8e4240e 100644 --- a/openwrt/package/base-files/x86-2.4/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/x86-2.6/etc/config/network b/openwrt/package/base-files/x86-2.6/etc/config/network index f1ed977450..68d8e4240e 100644 --- a/openwrt/package/base-files/x86-2.6/etc/config/network +++ b/openwrt/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/openwrt/package/base-files/xscale-2.6/etc/config/network b/openwrt/package/base-files/xscale-2.6/etc/config/network index aadd4aa8ed..1d9b55b2d3 100644 --- a/openwrt/package/base-files/xscale-2.6/etc/config/network +++ b/openwrt/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 -- 2.30.2