X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9325eaaa8cfc578fe07e8e3e3990e3da90bf7728..aeb76a3ddf319e7596c9f8edba9b0ec9e6d603f6:/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 c8743539d..b5d900a73 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,41 @@ 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}" + append batch "delete network.eth0.${1}${N}" + append batch "set network.eth0_${n}=switch_vlan${N}" + append batch "set network.eth0_${n}.device=eth0${N}" + append batch "set network.eth0_${n}.vlan=${id}${N}" + append batch "set network.eth0_${n}.ports='${2}'${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 +54,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] @@ -57,6 +101,12 @@ start() { c["wan_ifname"] = "" c["lan_ifname"] = "eth1" } + if (model == "ASUS WL-330gE") { + c["wan_ifname"] = "" + c["lan_ifname"] = "eth0" + c["vlan0ports"] = "" + c["vlan1ports"] = "" + } if (model == "ASUS WL-500g") { c["wan_ifname"] = "eth1" c["lan_ifname"] = "eth0" @@ -65,8 +115,13 @@ start() { c["vlan0ports"] = "0 1 2 3 5*" c["vlan1ports"] = "4 5" } - if (model == "Dell TrueMobile 2300") { + 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" } @@ -102,6 +157,18 @@ start() { } } } + # 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" + } + if (nvram["boardtype"] == "0x478") { + # generic broadcom 4785 processor with 5397 switch? + c["vlan0ports"] = "1 2 3 4 8*" + c["vlan1ports"] = "0 8" + } # WAP54G if ((nvram["boardnum"] == "2") || \ @@ -132,13 +199,21 @@ start() { c["vlan0ports"]="0 1 2 3 5*" c["vlan1ports"]="4 5" } + if (model == "ASUS WL-500W") { + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + c["vlan0ports"] = "0 1 2 3 4 5u" + c["vlan1ports"] = "" + } - 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\"" @@ -157,10 +232,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 }