brcm47xx: get switch name from swconfig first
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 5 Jul 2014 12:15:03 +0000 (12:15 +0000)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 5 Jul 2014 12:15:03 +0000 (12:15 +0000)
Without this patch the switch config for the adm switch did not worked,
because hey are not names eth0.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 41512

target/linux/brcm47xx/base-files/etc/init.d/netconfig

index ced2a42..3500058 100755 (executable)
@@ -45,6 +45,8 @@ start() {
 
        local cpuport=5
        [ -e /sbin/swconfig ] && cpuport=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p")
+       local switchname=eth0
+       [ -e /sbin/swconfig ] && switchname=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|switch0: \([^\\\\(]*\).*|\1|p")
        local model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)
 
        local network_defs=`(
@@ -224,14 +226,14 @@ start() {
        eval "$network_defs"
 
        [ -n "$vlan1ports" -o -n "$vlan2ports" ] && {
-               local cfg=`ucidef_add_switch "eth0" 1 1`
+               local cfg=`ucidef_add_switch "$switchname" 1 1`
                [ -n "$cfg" ] && uci rename network.$cfg=eth0
                [ -n "$vlan1ports" ] && {
-                       cfg=`ucidef_add_switch_vlan "eth0" 1 "$vlan1ports"`
+                       cfg=`ucidef_add_switch_vlan "$switchname" 1 "$vlan1ports"`
                        [ -n "$cfg" ] && uci rename network.$cfg=eth0_1
                }
                [ -n "$vlan2ports" ] && {
-                       cfg=`ucidef_add_switch_vlan "eth0" 2 "$vlan2ports"`
+                       cfg=`ucidef_add_switch_vlan "$switchname" 2 "$vlan2ports"`
                        [ -n "$cfg" ] && uci rename network.$cfg=eth0_2
                }
        }