1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-12 10:31:51 +00:00

Changes in default network configuration

This commit is contained in:
Ycarus (Yannick Chabanois) 2025-02-07 17:39:58 +01:00
parent 49a1c4eda4
commit 4310806772

View file

@ -2,8 +2,8 @@
. /lib/functions.sh . /lib/functions.sh
_setup_macaddr() { _setup_macaddr() {
uci -q get "network.$1.macaddr" >/dev/null && return uci -q get "network.${1}.macaddr" >/dev/null && return
uci -q set "network.$1.macaddr=$2" uci -q set "network.${1}.macaddr=$2"
} }
_setup_macvlan() { _setup_macvlan() {
@ -104,11 +104,13 @@ if [ "$(uci -q show network.lan | grep multipath)" != "" ]; then
fi fi
lanif="eth0" lanif="eth0"
if [ "$(grep rockchip /etc/os-release)" != "" ]; then if [ "$(cat /etc/board.json | jsonfilter -q -e '@.model.id' | tr -d '\n')" = "friendlyarm,nanopi-r5c" ]; then
lanif="eth0"
elif [ "$(grep rockchip /etc/os-release)" != "" ]; then
lanif="eth1" lanif="eth1"
elif [ "$(grep filogic /etc/os-release)" != "" ]; then elif [ "$(grep filogic /etc/os-release)" != "" ]; then
lanif="eth1" lanif="eth1"
elif [ "$(cat /etc/board.json | jsonfilter -q -e '@.model.id' | tr -d '\n')" = "bananapi_bpi-r3" ]; then elif [ -n "$(cat /etc/board.json | jsonfilter -q -e '@.model.id' | grep bananapi_bpi-r3)" ]; then
lanif="eth0" lanif="eth0"
elif [ -d /sys/class/net/lan0 -o -n "$(ip link | grep ' lan0')" ] && [ -d /sys/class/net/wan -o -n "$(ip link | grep ' wan@')" -o -n "$(ip link | grep ' wan:')" ]; then elif [ -d /sys/class/net/lan0 -o -n "$(ip link | grep ' lan0')" ] && [ -d /sys/class/net/wan -o -n "$(ip link | grep ' wan@')" -o -n "$(ip link | grep ' wan:')" ]; then
lanif="wan" lanif="wan"
@ -196,11 +198,23 @@ set network.lan.delegate=0
set network.lan.addlatency=0 set network.lan.addlatency=0
set network.lan.txqueuelen=2000 set network.lan.txqueuelen=2000
set dhcp.lan.dhcpv4='server' set dhcp.lan.dhcpv4='server'
set network.lan_dev=device
set network.lan_dev.name=${lanif}
EOF EOF
# Add Lan device if no device defined
if [ -z "$(uci -q show network | grep device)" ]; then
uci -q batch <<-EOF
set network.lan_dev=device
set network.lan_dev.name=${lanif}
EOF
fi
# Delete all bridges
#if [ -n "$(uci -q show network | grep bridge)" ]; then
# for bridge in $(uci -q show network | awk -F. '/bridge/ { print $2}'); do
# uci -q delete network.${bridge}
# done
#fi
uci -q batch <<-EOF uci -q batch <<-EOF
delete network.none delete network.none
delete network.wan delete network.wan
@ -245,6 +259,11 @@ if [ "$(uci -q show network.wan1 | grep multipath)" = "" ] && [ -z "$(uci -q get
_setup_wan_interface wan2 eth1.2 on _setup_wan_interface wan2 eth1.2 on
_setup_wan_interface wan3 eth1.3 on _setup_wan_interface wan3 eth1.3 on
_setup_wan_interface wan4 eth1.4 on _setup_wan_interface wan4 eth1.4 on
elif [ "$(cat /etc/board.json | jsonfilter -q -e '@.model.id' | tr -d '\n')" = "friendlyarm,nanopi-r5c" ]; then
_setup_wan_interface wan1 eth1 master macvlan
_setup_wan_interface wan2 eth1 on macvlan
_setup_macvlan wan1
_setup_macvlan wan2
elif [ "$(grep rockchip /etc/os-release)" != "" ]; then elif [ "$(grep rockchip /etc/os-release)" != "" ]; then
_setup_wan_interface wan1 eth0 master macvlan _setup_wan_interface wan1 eth0 master macvlan
_setup_wan_interface wan2 eth0 on macvlan _setup_wan_interface wan2 eth0 on macvlan