From: rwhitby Date: Thu, 21 Dec 2006 00:26:45 +0000 (+0000) Subject: Moved netconfig (for ixp4xx only) to S15, so that it can access /proc/cpuinfo to... X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=e80088eca92e6d03911864d411bf89aac63f0d1d;hp=3b6ddf5f3d9932030bc1d508dc2f097d12d465ed;p=openwrt-10.03%2F.git Moved netconfig (for ixp4xx only) to S15, so that it can access /proc/cpuinfo to determine which type of board it is on. Added ifup commands at the end to bring up the interfaces. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5886 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig b/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig index 352a2a9a2..ded5f4b8d 100755 --- a/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig +++ b/target/linux/ixp4xx-2.6/base-files/etc/init.d/netconfig @@ -1,7 +1,7 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2006 OpenWrt.org -START=05 +START=15 # hardware # the 'Hardware' string from cpuinfo @@ -25,18 +25,6 @@ machine(){ esac } -# Returns the mtd device with the specified name (without leading /dev) -# $1 = name of mtd device -get_mtd() { - grep "\"$1\"*$" /proc/mtd | cut -d : -f 1 -} - -# Returns the mtd block device with the specified name (without leading /dev) -# $1 = name of mtd device -get_mtdblock() { - echo $(get_mtd "$1") | sed 's/mtd/mtdblock/' -} - start() { [ -e /etc/config/network ] && exit 0 @@ -62,7 +50,6 @@ start() { BEGIN { FS="=" - getline model } { c[$1] = $2 } @@ -78,8 +65,8 @@ start() { print "" print "#### LAN configuration" print "config interface lan" - print " option ifname eth0" - if ((model == "nslu2") || (model == "nas100d")) { + print " option ifname \"eth0\"" + if ((c["model"] == "nslu2") || (c["model"] == "nas100d")) { p("proto", "bootproto") p("ipaddr", "ip_addr") p("netmask", "netmask") @@ -88,7 +75,10 @@ start() { p("hostname", "disk_server_name") } else { - print " option proto dhcp" + print " option proto dhcp" } }' > /etc/config/network + + ifup loopback + ifup lan }