183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-files: generated named bridge-vlan sections

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin 2020-11-19 15:08:33 +01:00
parent f276395cda
commit 8134c542e2
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,14 +18,15 @@ generate_bridge() {
bridge_vlan_id=0 bridge_vlan_id=0
generate_bridge_vlan() { generate_bridge_vlan() {
local device=$1 local name=$1_vlan
local ports="$2" local device=$2
local ports="$3"
bridge_vlan_id=$((bridge_vlan_id + 1)) bridge_vlan_id=$((bridge_vlan_id + 1))
uci -q batch <<-EOF uci -q batch <<-EOF
add network bridge-vlan set network.$name=bridge-vlan
set network.@bridge-vlan[-1].device='$device' set network.$name.device='$device'
set network.@bridge-vlan[-1].vlan='$bridge_vlan_id' set network.$name.vlan='$bridge_vlan_id'
set network.@bridge-vlan[-1].ports='$ports' set network.$name.ports='$ports'
EOF EOF
} }
@ -101,7 +102,7 @@ generate_network() {
esac esac
[ -n "$bridge" ] && { [ -n "$bridge" ] && {
generate_bridge_vlan $bridge "$ifname" generate_bridge_vlan $1 $bridge "$ifname"
ifname=$bridge.$bridge_vlan_id ifname=$bridge.$bridge_vlan_id
type="" type=""
} }