finally fix the /etc/config/network bug on wgt634u (#214, #215, #219)

[openwrt/svn-archive/archive.git] / openwrt / target / linux / package / base-files / files / brcm-2.6 / etc / init.d / S05netconfig

diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
index 3c4c032563f6955e0bae374fab5ab07d0534417d..94ee18e5641d347e3c82ec9ff4492167b059a94b 100755 (executable)
--- a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
+++ b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig
@@ -4,7 +4,7 @@
 mkdir -p /etc/config
 
 (
-       if [ "$(/usr/bin/head -c4 /dev/mtdblock/1 | /usr/bin/tail -c3)" = "ELF" ]; then
+       if grep 'mtd0: 00060000' /proc/mtd 2>&- >&-; then
                # WGT634u
                echo boardtype=wgt634u
        else
@@ -31,7 +31,7 @@ BEGIN {
 
 END {
        # v1 hardware
-       if (nvram["boardtype"] == "bcm4710dev") {
+       if (nvram["boardtype"] == "bcm94710dev") {
                # Linksys WRT54G v1.x
                if (nvram["boardnum"] == "42") {
                        c["vlan0ports"]=""
@@ -57,7 +57,7 @@ END {
        # WAP54G
        if ((nvram["boardnum"] == "2") || \
                (nvram["boardnum"] == "1024")) {
-               c["lan_ifnames"]="eth1 eth2"
+               c["lan_ifnames"]="eth0 eth1"
                c["wan_ifname"]=""
        }
 
@@ -78,7 +78,6 @@ END {
        print "# lan_gateway=\"192.168.1.1\""
 
        print ""
-       p("unused_ifnames")
        print ""
 
        print "#### WAN configuration"
@@ -89,10 +88,10 @@ END {
        print "#   pppoe: PPP over Ethernet"
        print "#   pptp: Point-to-Point tunneling Protocol"
        print "#     for pppoe and pptp you need to use wan_ifname=\"ppp0\""
-       print "#     and {pppoe,pptp}ifname=\"" c["wan_ifname"] "\")"
        print ""
        print "wan_proto=dhcp"
        p("wan_ifname")
+       print "wan_device=\"" c["wan_ifname"] "\""
        print "# wan_ipaddr=\"192.168.0.2\""
        print "# wan_netmask=\"255.255.255.0\""
        print "# wan_gateway=\"192.168.0.1\""
@@ -100,8 +99,6 @@ END {
        print ""
        print "## PPP over Ethernet and PPTP"
        print "# wan_ifname=\"ppp0\""
-       print "# pppoe_ifname=\"" c["wan_ifname"] "\""
-       print "# pptp_ifname=\"" c["wan_ifname"] "\""
        print "# pptp_server_ip=\"192.168.0.1\""
 }
 ' > /etc/config/network