Moved netconfig (for ixp4xx only) to S15, so that it can access /proc/cpuinfo to...

SVN-Revision: 5886

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 352a2a9a2ba5ad5b21f6f3fca3fee7470a20a04e..ded5f4b8d62dc6db40f91ea53b46283cbcab505f 100755 (executable)
--- 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
 }