maple/istoreos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base: fix duplicated mac address on bridge members

Browse Source
This commit is contained in:
jjm2473 2022-11-24 16:26:47 +08:00
parent d58f61c35d
commit 263dd25c7f
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
CFG=/etc/board.json
. /usr/share/libubox/jshn.sh
. /lib/functions/system.sh
[ -s $CFG ] || /bin/board_detect || exit 1
[ -s /etc/config/network -a -s /etc/config/system ] && exit 0
@ -123,6 +123,7 @@ generate_network() {
set network.@device[-1].name='$port'
set network.@device[-1].macaddr='$macaddr'
EOF
macaddr=$(macaddr_add "$macaddr" 2)
done
}
device=br-$1

2
target/linux/rockchip/armv8/base-files/etc/board.d/02_network
View File

@ -57,7 +57,7 @@ rockchip_setup_macs()
case "$board" in
friendlyarm,nanopi-r2s)
wan_mac=$(generate_mac_from_mmc_cid)
lan_mac=$(macaddr_add "$wan_mac" +1)
lan_mac=$(macaddr_add "$wan_mac" 1)
;;
friendlyarm,nanopi-r4s|\
friendlyarm,nanopi-r4se)

8
target/linux/rockchip/rk3568/base-files/etc/board.d/02_network
View File

@ -43,7 +43,6 @@ rockchip_setup_macs()
local board="$1"
local lan_mac=""
local wan_mac=""
local label_mac=""
case "$board" in
firefly,rk3568-roc-pc|\
@ -51,14 +50,13 @@ rockchip_setup_macs()
fastrhino,r66s|\
rockchip,rk3568-lunzn-r68s|\
fastrhino,r68s)
lan_mac=$(generate_mac_from_mmc)
wan_mac=$(macaddr_add "$lan_mac" +1)
wan_mac=$(generate_mac_from_mmc)
lan_mac=$(macaddr_add "$lan_mac" 1)
;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
[ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
}
board_config_update