aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-05-15 21:06:27 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-05-18 20:07:51 +0200
commit43fc720657c6e3b30c6ed89d7227ee6e646c158b (patch)
tree27ddfb0225b91e1cb083c487f59bef67ad795acf
parente88438997627764bfbe81652edf2a250e410df6a (diff)
downloadupstream-43fc720657c6e3b30c6ed89d7227ee6e646c158b.tar.gz
upstream-43fc720657c6e3b30c6ed89d7227ee6e646c158b.tar.bz2
upstream-43fc720657c6e3b30c6ed89d7227ee6e646c158b.zip
base-files: generate "device" UCI type section for bridge
This switches from the old way of defining bridges in an "interface" UCI section type (that should be used for layer 3 only). From now a defualt board switch will have its own "device" UCI section type. It's a new & preferred way of defining L2 devices. Before: config interface 'lan' option type 'bridge' option ifname 'lan1 lan2 lan3 lan4' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' After: config device option name 'lan' option type 'bridge' list ports 'lan1' list ports 'lan2' list ports 'lan3' list ports 'lan4' config interface 'lan' option ifname 'lan' option proto 'static' option ipaddr '192.168.1.1' option netmask '255.255.255.0' Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
-rwxr-xr-xpackage/base-files/files/bin/config_generate10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 56f6c4423b..0f6f280cf0 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -110,8 +110,14 @@ generate_network() {
}
[ -n "$ports" ] && {
- type="bridge"
- ifname="$ports"
+ uci -q batch <<-EOF
+ add network device
+ set network.@device[-1].name='$1'
+ set network.@device[-1].type='bridge'
+ EOF
+ for port in $ports; do uci add_list network.@device[-1].ports="$port"; done
+ ifname=$1
+ type=
}
[ -n "$bridge" ] && {