[package] switch:

[openwrt.git] / target / linux / brcm-2.4 / base-files / etc / init.d / netconfig

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 4d66962..0e014b6 100755 (executable)
--- 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
 
@@ -73,7 +108,7 @@ start() {
                        c["vlan0ports"] = ""
                        c["vlan1ports"] = ""
                }
-               if (model == "ASUS WL-500g") {
+               if ((model == "ASUS WL-500g") || (model == "Microsoft MN-700")) {
                        c["wan_ifname"] = "eth1"
                        c["lan_ifname"] = "eth0"
                }
@@ -130,8 +165,10 @@ start() {
                        c["lan_ifname"] = "eth0"
                        c["wan_ifname"] = "eth1"
                }
-               if (nvram["boardtype"] == "0x478") {
-                       # generic broadcom 4785 processor with 5397 switch?
+               # 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"
                }
@@ -171,6 +208,12 @@ 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"
+               }
 
                if (c["vlan0ports"] || c["vlan1ports"]) {
                        print "#### VLAN configuration "