X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/661c255a540b3f7e43f4f937a45cf3e7d2e433d8..074a54bf850513ca066ee4a73ed213cbeb476d52:/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 f782d41c0..51be73b5b 100755
--- 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
@@ -1,9 +1,10 @@
 #!/bin/sh
 [ -e /etc/config/network ] && exit 0
 
+mkdir -p /etc/config
+
 (
-	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
@@ -30,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"]=""
@@ -47,6 +48,7 @@ END {
 	if (nvram["boardtype"] == "wgt634u") {
 		c["vlan0ports"] = "0 1 2 3 5*"
 		c["vlan1ports"] = "4 5"
+		c["lan_ifnames"] = "vlan0 ath0"
 	}
 	if (nvram["boardtype"] == "0x0467") {
 		c["vlan0ports"] = "0 1 2 3 5*"
@@ -73,6 +75,7 @@ END {
 	p("lan_ifname")
 	p("lan_ifnames")
 	print "lan_ipaddr=\"192.168.1.1\""
+	print "lan_netmask=\"255.255.255.0\""
 	print "# lan_dns=\"192.168.1.1\""
 	print "# lan_gateway=\"192.168.1.1\""
 
@@ -87,10 +90,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\""
@@ -98,8 +101,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