treewide: use only board_name function to get name

[openwrt/openwrt.git] / target / linux / brcm47xx / base-files / etc / board.d / 01_detect

diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_detect b/target/linux/brcm47xx/base-files/etc/board.d/01_detect
index 841aafac35612c72cb173288413c14fbc8d5c59a..f1022dc13a744a258cfbb1e7634071f323c87715 100755 (executable)
--- a/target/linux/brcm47xx/base-files/etc/board.d/01_detect
+++ b/target/linux/brcm47xx/base-files/etc/board.d/01_detect
@@ -17,6 +17,13 @@ detect_by_vlanports() {
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0"
 
+       elif [ "${vlan0ports:0:9}" = "1 2 3 4 8" -a "${vlan1ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ] || \
+            [ "${vlan1ports:0:9}" = "1 2 3 4 8" -a "${vlan2ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ] || \
+            [ "${vlan2ports:0:9}" = "1 2 3 4 8" -a "${vlan1ports:0:3}" = "0 8" -a ${cpuport:-0} -eq 8 ];
+       then
+               ucidef_add_switch "switch0" \
+                       "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "8@eth0"
+
        elif [ "${vlan0ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \
                 [ "${vlan1ports:0:9}" = "0 1 2 3 5" -a "${vlan2ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \
                 [ "${vlan2ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ];
@@ -24,6 +31,13 @@ detect_by_vlanports() {
                ucidef_add_switch "switch0" \
                        "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
 
+       elif [ "${vlan0ports:0:9}" = "1 2 3 4 5" -a "${vlan1ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ] || \
+            [ "${vlan1ports:0:9}" = "1 2 3 4 5" -a "${vlan2ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ] || \
+            [ "${vlan2ports:0:9}" = "1 2 3 4 5" -a "${vlan1ports:0:3}" = "0 5" -a ${cpuport:-0} -eq 5 ];
+       then
+               ucidef_add_switch "switch0" \
+                       "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5@eth0"
+
        else
                logger -t "01_detect" "Unable to determine network configuration"
                ucidef_set_interface_lan "eth0"
@@ -110,7 +124,7 @@ detect_by_model() {
        # Netgear WGT634U exception
        if grep -sqE 'mtd0: 000(6|a)0000' /proc/mtd; then
                ucidef_add_switch "switch0" \
-                       "0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0"
+                       "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0"
                return
        fi
 
@@ -149,6 +163,11 @@ detect_by_model() {
                        "0:lan" "1:lan" "2:lan" "3:lan" "5@eth0"
                ;;
 
+       "Linksys E3000 V1")
+               ucidef_add_switch "switch0" \
+                       "0:wan" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "8@eth0"
+               ;;
+
        *)
                detect_by_boardtype "$boardtype" "$boardnum"
                ;;
@@ -156,9 +175,9 @@ detect_by_model() {
 }
 
 
-local model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)"
-local boardtype="$(nvram get boardtype)"
-local boardnum="$(nvram get boardnum)"
+model="$(board_name)"
+boardtype="$(nvram get boardtype)"
+boardnum="$(nvram get boardnum)"
 
 board_config_update