• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt


Commit MetaInfo

Revisão99552e0a312f7f30cff99a203e50c6cbd244efbe (tree)
Hora2022-01-24 17:41:33
AutorTianling Shen <cnsztl@immo...>
CommiterTianling Shen

Mensagem de Log

autocore: sync with upstream source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Mudança Sumário

Diff

--- a/package/emortal/autocore/files/arm/rpcd_luci
+++ b/package/emortal/autocore/files/arm/rpcd_luci
@@ -165,7 +165,11 @@ local methods = {
165165 local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r")
166166 local rv = {}
167167
168- if ok then
168+ if not (ok and fd) then
169+ ok, fd = pcall(io.open, "/usr/share/firewall4/helpers", "r")
170+ end
171+
172+ if ok and fd then
169173 local entry
170174
171175 while true do
@@ -209,7 +213,7 @@ local methods = {
209213 rv.firewall = fs.access("/sbin/fw3")
210214 rv.firewall4 = fs.access("/sbin/fw4")
211215 rv.opkg = fs.access("/bin/opkg")
212- rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt")
216+ rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") or fs.access("/sys/module/nft_flow_offload/refcnt")
213217 rv.br2684ctl = fs.access("/usr/sbin/br2684ctl")
214218 rv.swconfig = fs.access("/sbin/swconfig")
215219 rv.odhcpd = fs.access("/usr/sbin/odhcpd")
--- a/package/emortal/autocore/files/x86/rpcd_luci
+++ b/package/emortal/autocore/files/x86/rpcd_luci
@@ -165,7 +165,11 @@ local methods = {
165165 local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r")
166166 local rv = {}
167167
168- if ok then
168+ if not (ok and fd) then
169+ ok, fd = pcall(io.open, "/usr/share/firewall4/helpers", "r")
170+ end
171+
172+ if ok and fd then
169173 local entry
170174
171175 while true do
@@ -209,7 +213,7 @@ local methods = {
209213 rv.firewall = fs.access("/sbin/fw3")
210214 rv.firewall4 = fs.access("/sbin/fw4")
211215 rv.opkg = fs.access("/bin/opkg")
212- rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt")
216+ rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") or fs.access("/sys/module/nft_flow_offload/refcnt")
213217 rv.br2684ctl = fs.access("/usr/sbin/br2684ctl")
214218 rv.swconfig = fs.access("/sbin/swconfig")
215219 rv.odhcpd = fs.access("/usr/sbin/odhcpd")
Show on old repository browser