mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

netmode: fix static mode

Browse source 
and improve other modes
This commit is contained in:
Sukru Senli 2025-10-20 16:43:38 +02:00
parent 2fe133227d
commit dfe2af4643
3 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
netmode/files/etc/netmodes/routed-dhcp/scripts/10-routed-dhcp
View file

@ -46,16 +46,19 @@ l3_network_config() {
uci -q set network.wan6.proto='dhcpv6' uci -q set network.wan6.proto='dhcpv6'
uci -q delete network.wan6.disabled uci -q delete network.wan6.disabled
if [ -n "$wandev" -a -n "$NETMODE_vlanid" -a $NETMODE_vlanid -gt 0 ]; then if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
uci -q set network.vlan_${NETMODE_vlanid}=device uci -q set network.vlan_${NETMODE_vlanid}=device
uci -q set network.vlan_${NETMODE_vlanid}.type="8021q" uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid" uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev" uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
uci -q set network.wan.device="$wandev.$NETMODE_vlanid" wandev="$wandev.$NETMODE_vlanid"
fi fi
uci -q set network.wan.device="$wandev"
uci -q set network.wan6.device="$wandev"
uci -q delete network.wan.dns uci -q delete network.wan.dns
if [ -n "$NETMODE_dns_servers" ]; then if [ -n "$NETMODE_dns_servers" ]; then
dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')" dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
@ -84,12 +87,6 @@ l3_network_config() {
[ -n "$device" ] && uci add_list network.br_lan.ports="$device" [ -n "$device" ] && uci add_list network.br_lan.ports="$device"
fi fi
json_select .. json_select ..
json_select wan 2>/dev/null
json_get_var device device
if [ -n "$device" ]; then
uci -q set network.wan.device="$device"
uci -q set network.wan6.device="$device"
fi
json_cleanup json_cleanup
fi fi

13
netmode/files/etc/netmodes/routed-pppoe/scripts/10-routed-pppoe
View file

@ -44,16 +44,19 @@ l3_network_pppoe_config() {
uci -q set network.wan6.disabled='1' uci -q set network.wan6.disabled='1'
if [ -n "$wandev" -a -n "$NETMODE_vlanid" -a $NETMODE_vlanid -gt 0 ]; then if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
uci -q set network.vlan_${NETMODE_vlanid}=device uci -q set network.vlan_${NETMODE_vlanid}=device
uci -q set network.vlan_${NETMODE_vlanid}.type="8021q" uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid" uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev" uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
uci -q set network.wan.device="$wandev.$NETMODE_vlanid" wandev="$wandev.$NETMODE_vlanid"
fi fi
uci -q set network.wan.device="$wandev"
uci -q set network.wan6.device="$wandev"
uci -q delete network.wan.dns uci -q delete network.wan.dns
if [ -n "$NETMODE_dns_servers" ]; then if [ -n "$NETMODE_dns_servers" ]; then
dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')" dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
@ -82,12 +85,6 @@ l3_network_pppoe_config() {
[ -n "$device" ] && uci add_list network.br_lan.ports="$device" [ -n "$device" ] && uci add_list network.br_lan.ports="$device"
fi fi
json_select .. json_select ..
json_select wan 2>/dev/null
json_get_var device device
if [ -n "$device" ]; then
uci -q set network.wan.device="$device"
uci -q set network.wan6.device="$device"
fi
json_cleanup json_cleanup
fi fi

27
netmode/files/etc/netmodes/routed-static/scripts/10-routed-static
View file

@ -45,6 +45,19 @@ l3_network_config() {
uci -q set network.wan6.disabled='1' uci -q set network.wan6.disabled='1'
if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
uci -q set network.vlan_${NETMODE_vlanid}=device
uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
wandev="$wandev.$NETMODE_vlanid"
fi
uci -q set network.wan.device="$wandev"
uci -q set network.wan6.device="$wandev"
uci -q delete network.wan.dns uci -q delete network.wan.dns
if [ -n "$NETMODE_dns_servers" ]; then if [ -n "$NETMODE_dns_servers" ]; then
dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')" dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
@ -53,14 +66,6 @@ l3_network_config() {
done done
fi fi
uci -q delete network.wan.dns
if [ -n "$NETMODE_dns_servers" ]; then
IFS=',' read -ra ADDRS <<< "$NETMODE_dns_servers"
for ip in "${ADDRS[@]}"; do
uci -q add_list network.wan.dns=$ip
done
fi
uci -q delete network.br_lan.ports uci -q delete network.br_lan.ports
uci -q set network.br_lan.bridge_empty='1' uci -q set network.br_lan.bridge_empty='1'
@ -81,12 +86,6 @@ l3_network_config() {
[ -n "$device" ] && uci add_list network.br_lan.ports="$device" [ -n "$device" ] && uci add_list network.br_lan.ports="$device"
fi fi
json_select .. json_select ..
json_select wan 2>/dev/null
json_get_var device device
if [ -n "$device" ]; then
uci -q set network.wan.device="$device"
uci -q set network.wan6.device="$device"
fi
json_cleanup json_cleanup
fi fi