From 958c3e6ae66efc1914d90d2ba19d8c5fdb116211 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sun, 27 Feb 2022 21:51:41 +0100 Subject: [PATCH] olsrd: switch to firewall4 Firewall4 uses nftables instead of iptables. Use iptables-nft for installing smart-gw-rules. Fixes: #731 ("Certain upstream switch to firewall4 aka nftables instead of iptables") Signed-off-by: Nick Hainke --- olsrd/Makefile | 2 +- olsrd/files/olsrd.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/olsrd/Makefile b/olsrd/Makefile index 7c8918c097..3acf8706a6 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -34,7 +34,7 @@ endef define Package/olsrd $(call Package/olsrd/template) MENU:=1 - DEPENDS:=+libpthread +libubus + DEPENDS:=+libpthread +libubus +iptables-nft endef define Package/olsrd/conffiles diff --git a/olsrd/files/olsrd.sh b/olsrd/files/olsrd.sh index cb52d1973a..379485f0e8 100644 --- a/olsrd/files/olsrd.sh +++ b/olsrd/files/olsrd.sh @@ -746,8 +746,8 @@ olsrd_setup_smartgw_rules() { nowan=0 fi - IP4T="$( command -v iptables )" - IP6T="$( command -v ip6tables )" + IP4T="$( command -v iptables-nft )" + IP6T="$( command -v iptables-nft )" # Delete smartgw firewall rules first if [ "$UCI_CONF_NAME" = "olsrd6" ]; then