From 4dc98fefcac468917227bd9037bf6a71cbed9b67 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 24 Oct 2022 17:18:43 +0000 Subject: luci-app-simple-adblock: bugfix: identify nft set support Signed-off-by: Stan Grishin --- .../luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'applications/luci-app-simple-adblock/luasrc/model') diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua index 00674ab267..ec047420a8 100644 --- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -52,7 +52,7 @@ function checkIpset() end function checkNftset() - if sys.call("command -v nft") == 0 then + if sys.call("command -v nft >/dev/null 2>&1") == 0 then return true else return false @@ -319,10 +319,10 @@ if checkDnsmasq() then dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts")) dns:value("dnsmasq.conf", translate("DNSMASQ Config")) if checkDnsmasqIpset() then - dns:value("dnsmasq.ipset", translate("DNSMASQ IP Set")) + dns:value("dnsmasq.ipset", translate("DNSMASQ Ipset")) end if checkDnsmasqNftset() then - dns:value("dnsmasq.nftset", translate("DNSMASQ NFT Set")) + dns:value("dnsmasq.nftset", translate("DNSMASQ Nft Set")) end dns:value("dnsmasq.servers", translate("DNSMASQ Servers File")) end -- cgit v1.2.3