X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/8d0837caa22ef76b3b8653602197b3f9d80ba235..35d8522c6a2841fe05f3bf02c4f3c2dbea81d8c7:/target/linux/brcm-2.4/base-files/etc/init.d/netconfig?ds=inline

diff --git a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
index ec25543ee..d20ff43b8 100755
--- a/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
+++ b/target/linux/brcm-2.4/base-files/etc/init.d/netconfig
@@ -4,7 +4,42 @@
 START=05
 
 start() {
-	[ -e /etc/config/network ] && exit 0
+	[ -e /etc/config/network ] && {
+		local batch
+
+		config_cb() {
+			case "$1" in
+			switch)
+				option_cb() {
+					case "$1" in
+					vlan[0-9]|vlan1[0-5])
+						local id="${1#vlan}"
+						local ports="${2%\*}"
+						append batch "delete network.eth0.${1}${N}"
+						append batch "set network.eth0_${id}=switch_vlan${N}"
+						append batch "set network.eth0_${id}.device=eth0${N}"
+						append batch "set network.eth0_${id}.vlan=${id}${N}"
+						append batch "set network.eth0_${id}.ports='${ports}'${N}"
+					;;
+					esac
+				}
+			;;
+			switch_vlan)
+				option_cb() { :; }
+				batch=""
+			;;
+			esac
+		}
+
+		config_load network
+
+		[ -n "$batch" ] && {
+			logger -t netconfig "migrating switch config to new format ..."
+			echo "$batch${N}commit network" | uci batch
+		}
+
+		exit 0
+	}
 
 	mkdir -p /etc/config
 
@@ -20,6 +55,16 @@ start() {
 		if (c[name] != "") print "	option " cfgname "	\"" c[name] "\""
 	}
 
+	function vlan(id, name) {
+		if (c[name] != "") {
+			print "config switch_vlan eth0_" id
+			print "	option device   \"eth0\""
+			print "	option vlan     " id
+			print "	option ports    \"" c[name] "\""
+			print ""
+		}
+	}
+
 	function macinc(mac, maca, i, result) {
 		split(mac, maca, ":")
 		for (i = 1; i <= 6; i++) maca[i] = "0x" maca[i]
@@ -38,7 +83,7 @@ start() {
 		FS="="
 		c["lan_ifname"]="eth0.0"
 		c["wan_ifname"]="eth0.1"
-		c["vlan0ports"]="1 2 3 4 5*"
+		c["vlan0ports"]="1 2 3 4 5"
 		c["vlan1ports"]="0 5"
 		getline < "/proc/diag/model"
 		model=$0
@@ -57,17 +102,28 @@ start() {
 			c["wan_ifname"] = ""
 			c["lan_ifname"] = "eth1"
 		}
-		if (model == "ASUS WL-500g") {
+		if (model == "ASUS WL-330gE") {
+			c["wan_ifname"] = ""
+			c["lan_ifname"] = "eth0"
+			c["vlan0ports"] = ""
+			c["vlan1ports"] = ""
+		}
+		if ((model == "ASUS WL-500g") || (model == "Microsoft MN-700")) {
 			c["wan_ifname"] = "eth1"
 			c["lan_ifname"] = "eth0"
 		}
 		if (model == "ASUS WL-500g Premium V2") {
-				c["vlan0ports"] = "0 1 2 3 5*"
+				c["vlan0ports"] = "0 1 2 3 5"
 				c["vlan1ports"] = "4 5"
 		}
-
 		if (model == "Dell TrueMobile 2300") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			c["lan_ifname"] = "eth0"
+			c["wan_ifname"] = "eth1"
+			c["vlan0ports"] = "0 1 2 3 4 5u"
+			c["vlan1ports"] = ""
+		}
+		if (model == "Dell TrueMobile 2300 v2") {
+			c["vlan0ports"] = "0 1 2 3 5"
 			c["vlan1ports"] = "4 5"
 		}
 		if (nvram["boardtype"] == "bcm94710r4") {
@@ -76,17 +132,17 @@ start() {
 			c["wan_ifname"] = "eth1"
 		}
 		if (nvram["boardtype"] == "wgt634u") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			c["vlan0ports"] = "0 1 2 3 5"
 			c["vlan1ports"] = "4 5"
 		}
 		if (nvram["boardtype"] == "0x0467") {
-			c["vlan0ports"] = "0 1 2 3 5*"
+			c["vlan0ports"] = "0 1 2 3 5"
 			c["vlan1ports"] = "4 5"
 		}
 		if ((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) {
 			if (nvram["boardnum"] == "45") {
 				# WL-500gP
-				c["vlan0ports"] = "1 2 3 4 5*"
+				c["vlan0ports"] = "1 2 3 4 5"
 				c["vlan1ports"] = "0 5"
 			} else {
 				# Generic BCM94704
@@ -102,8 +158,17 @@ start() {
 				}
 			}
 		}
-		if (nvram["boardtype"] == "0x478") {
-			# generic broadcom 4785 processor with 5397 switch?
+		# Buffalo WBR-B11 and Buffalo WBR-G54
+		if (nvram["boardtype"] == "bcm94710ap") {
+			c["vlan0ports"] = "0 1 2 3 4 5u"
+			c["vlan1ports"] = ""
+			c["lan_ifname"] = "eth0"
+			c["wan_ifname"] = "eth1"
+		}
+		# generic broadcom 4705/4785 processor with 5397 switch?
+		#  EXCEPT Linksys WRT300N V1.1
+		if ((nvram["boardtype"] == "0x478") && \
+		    (model != "Linksys WRT300N V1.1")) {
 			c["vlan0ports"] = "1 2 3 4 8*"
 			c["vlan1ports"] = "0 8"
 		}
@@ -129,12 +194,12 @@ start() {
 		if (model == "ASUS WL-700gE") {
 			c["lan_ifname"]="eth0.0"
 			c["wan_ifname"]="eth0.1"
-			c["vlan0ports"]="1 2 3 4 5*"
+			c["vlan0ports"]="1 2 3 4 5"
 			c["vlan1ports"]="0 5"
 		}
 
 		if (model == "Motorola WR850G V2/V3") {
-			c["vlan0ports"]="0 1 2 3 5*"
+			c["vlan0ports"]="0 1 2 3 5"
 			c["vlan1ports"]="4 5"
 		}
 		if (model == "ASUS WL-500W") {
@@ -143,13 +208,21 @@ start() {
 			c["vlan0ports"] = "0 1 2 3 4 5u"
 			c["vlan1ports"] = ""
 		}
+		if (model == "OvisLink WL-1600GL") {
+			c["lan_ifname"] = "eth0.0"
+			c["wan_ifname"] = "eth0.1"
+			c["vlan0ports"] = "0 1 2 3 5"
+			c["vlan1ports"] = "4 5"
+		}
 
-		print "#### VLAN configuration "
-		print "config switch eth0"
-		p("vlan0", "vlan0ports")
-		p("vlan1", "vlan1ports")
-		print ""
-		print ""
+		if (c["vlan0ports"] || c["vlan1ports"]) {
+			print "#### VLAN configuration "
+			print "config switch eth0"
+			print "	option enable   1"
+			print ""		
+			vlan(0, "vlan0ports")
+			vlan(1, "vlan1ports")
+		}
 		print "#### Loopback configuration"
 		print "config interface loopback"
 		print "	option ifname	\"lo\""
@@ -168,10 +241,16 @@ start() {
 		print "	option netmask	255.255.255.0"
 		print ""
 		print ""
-		print "#### WAN configuration"
-		print "config interface	wan"
-		p("ifname", "wan_ifname")
-		p("macaddr", "wan_macaddr")
-		print "	option proto	dhcp"
+		if (c["wan_ifname"]) {
+			print "#### WAN configuration"
+			print "config interface	wan"
+			p("ifname", "wan_ifname")
+			p("macaddr", "wan_macaddr")
+			print "	option proto	dhcp"
+		} else {
+			print "#### WAN configuration (disabled)"
+			print "#config interface wan"
+			print "#	option proto	dhcp"
+		}
 	}' > /etc/config/network
 }