From d05eb63a52c3ca7a8e82d7c0219340bf8c079f4c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Thu, 21 Mar 2024 17:46:35 +0100 Subject: [PATCH] Delete old network rules in omr-bypass --- omr-bypass/files/etc/init.d/omr-bypass-nft | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/omr-bypass/files/etc/init.d/omr-bypass-nft b/omr-bypass/files/etc/init.d/omr-bypass-nft index cc8a32a2d..014e1dabc 100755 --- a/omr-bypass/files/etc/init.d/omr-bypass-nft +++ b/omr-bypass/files/etc/init.d/omr-bypass-nft @@ -825,6 +825,12 @@ _delete_firewall_rules() { } } +_delete_network_rules() { + [ -n "$(echo $1 | grep fw_rule)" ] && { + uci -q delete network.$1 + } +} + boot() { BOOT=1 start "$@" @@ -841,6 +847,9 @@ start_service() { config_foreach _delete_firewall_rules rule config_foreach _delete_firewall_rules ipset #uci -q commit firewall + config_load network + config_foreach _delete_network_rules rule + #uci -q commit network add_domains="false" @@ -931,6 +940,8 @@ start_service() { uci -q commit omr-bypass uci -q commit dhcp uci -q commit firewall + uci -q commit network + /etc/init.d/network reload fw4 -q restart [ -z "$RELOAD" ] && [ "$add_domains" = "true" ] && {