fixup! reforis: update to version 3.2.1

turris-cz · Dec 17, 2024 · 426dc1f · 426dc1f
1 parent 4f473dd
commit 426dc1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh b/collect/sentinel/sentinel-dynfw-c-client/files/sentinel-firewall.nftables.sh
@@ -13,7 +13,7 @@ wl_list_cb() {
     local val="$1"
     if echo "$val" | grep -q "^[0-9.]*$"; then
         nft add element inet turris-sentinel dynfw_4_wl "{ $val }"
-    elif echo "$val" | grep -q "^[0-9a-fA-F/:]*$"; then
+    elif echo "$val" | grep -q "^[0-9a-fA-F:]*/*[0-9]*$"; then
         nft add element inet turris-sentinel dynfw_6_wl "{ $val }"
     else
         echo "Invalid ip address $val" >&2

diff --git a/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults b/collect/sentinel/sentinel-dynfw-c-client/files/uci-defaults
@@ -6,9 +6,5 @@ set -e
 uci -q delete firewall.sentinel_dynfw_client || :
 uci -q delete firewall.sentinel_dynfw_client_ipset || :
 
-
-# Enable for default wan interface
-config_firewall_default_enable "sentinel_dynfw"
-
 # Always reload firewall to use latest version of sentinel-firewall script
 /etc/init.d/firewall reload