mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Delete old dnsmasq ipset when using dscp nft

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-01-18 10:03:46 +01:00
parent 91316a23a4
commit c184f30c10
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
omr-dscp/files/etc/init.d/omr-dscp-nft
View file

@ -21,7 +21,7 @@ config_get lan_device lan ifname
_add_dscp_domain() { _add_dscp_domain() {
domain=""; config_get domain "$1" name "" domain=""; config_get domain "$1" name ""
class=""; config_get class "$1" class "" class=""; config_get class "$1" class ""
[ -n "$domain" ] && [ -n "$class" ] && [ -z "$(uci -q get dhcp.omr_dscp-$class.domain | grep $domain)" ] && { [ -n "$domain" ] && [ -n "$class" ] && [ -z "$(uci -q get dhcp.omr_dscp_$class.domain | grep $domain)" ] && {
uci -q batch <<-EOF uci -q batch <<-EOF
add_list dhcp.omr_dscp_$class.domain="$domain" add_list dhcp.omr_dscp_$class.domain="$domain"
commit dhcp commit dhcp
@ -146,6 +146,7 @@ _setup_tunnel() {
} }
_cleanup() { _cleanup() {
uci -q del dhcp.@dnsmasq[0].ipset
config_load dhcp config_load dhcp
config_foreach _remove_ipset_dnsmasq config_foreach _remove_ipset_dnsmasq
config_load firewall config_load firewall

1
openmptcprouter/files/etc/uci-defaults/0000-omr-update
View file

@ -3,6 +3,7 @@
cd /etc/uci-defaults || exit 0 cd /etc/uci-defaults || exit 0
# Keep dnsmasq ipset with old method # Keep dnsmasq ipset with old method
rm -f /etc/uci-defaults/50-dnsmasq-migrate-ipset.sh rm -f /etc/uci-defaults/50-dnsmasq-migrate-ipset.sh
uci -q del dhcp.@dnsmasq[0].ipset
source /etc/os-release source /etc/os-release