X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/52185b8adac058188fdff053ee561d07da6d8126..708e9983d71a725df7b4ed318fed891ae03596ff:/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 3c4c03256..72d5b63ac 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
@@ -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