hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

base-files: config_generate did not handle setups with more than 1 switch properly 

Signed-off-by: John Crispin <blogic@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43088 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-10-27 15:51:17 +00:00
parent c1baa9448d
commit edeaa79757
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/base-files/files/bin/config_generate
View File

@ -102,8 +102,6 @@ generate_switch() {
json_select $key json_select $key
json_get_vars enable reset blinkrate cpu_port json_get_vars enable reset blinkrate cpu_port
[ -n "$cpu_port" ] || return
uci -q batch <<EOF uci -q batch <<EOF
add network switch add network switch
set network.@switch[-1].name='$key' set network.@switch[-1].name='$key'
@ -111,9 +109,10 @@ set network.@switch[-1].reset='$reset'
set network.@switch[-1].enable_vlan='$enable' set network.@switch[-1].enable_vlan='$enable'
set network.@switch[-1].blinkrate='$blinkrate' set network.@switch[-1].blinkrate='$blinkrate'
EOF EOF
[ -n "$cpu_port" ] && {
json_get_keys vlans vlans json_get_keys vlans vlans
for vlan in $vlans; do generate_switch_vlan $1 $vlan $cpu_port; done for vlan in $vlans; do generate_switch_vlan $1 $vlan $cpu_port; done
}
json_select .. json_select ..
json_select .. json_select ..
} }