diff options
Diffstat (limited to 'modules/luci-base/root')
| -rwxr-xr-x | modules/luci-base/root/etc/init.d/ucitrack | 6 | ||||
| -rwxr-xr-x | modules/luci-base/root/usr/libexec/rpcd/luci | 13 | ||||
| -rw-r--r-- | modules/luci-base/root/usr/share/luci/menu.d/luci-base.json | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/modules/luci-base/root/etc/init.d/ucitrack b/modules/luci-base/root/etc/init.d/ucitrack index c7ceb32905..57ac11857f 100755 --- a/modules/luci-base/root/etc/init.d/ucitrack +++ b/modules/luci-base/root/etc/init.d/ucitrack @@ -41,10 +41,10 @@ register_trigger() { fi for affected in $affects; do - logger -t "ucitrack" "Setting up /etc/config/$config reload dependency on /etc/config/$affected" - procd_add_config_trigger "config.change" "$affected" \ + logger -t "ucitrack" "Setting up /etc/config/$affected reload dependency on /etc/config/$config" + procd_add_config_trigger "config.change" "$config" \ ubus call service event \ - "$(printf '{"type":"config.change","data":{"package":"%s"}}' $config)" + "$(printf '{"type":"config.change","data":{"package":"%s"}}' $affected)" done } diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci index 19cdb0ad39..6a80951e8c 100755 --- a/modules/luci-base/root/usr/libexec/rpcd/luci +++ b/modules/luci-base/root/usr/libexec/rpcd/luci @@ -165,7 +165,11 @@ local methods = { local ok, fd = pcall(io.open, "/usr/share/fw3/helpers.conf", "r") local rv = {} - if ok then + if not (ok and fd) then + ok, fd = pcall(io.open, "/usr/share/firewall4/helpers", "r") + end + + if ok and fd then local entry while true do @@ -207,8 +211,9 @@ local methods = { local ok, fd rv.firewall = fs.access("/sbin/fw3") + rv.firewall4 = fs.access("/sbin/fw4") rv.opkg = fs.access("/bin/opkg") - rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") + rv.offloading = fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") or fs.access("/sys/module/nft_flow_offload/refcnt") rv.br2684ctl = fs.access("/usr/sbin/br2684ctl") rv.swconfig = fs.access("/sbin/swconfig") rv.odhcpd = fs.access("/usr/sbin/odhcpd") @@ -218,7 +223,7 @@ local methods = { rv.dropbear = fs.access("/usr/sbin/dropbear") rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") rv.relayd = fs.access("/usr/sbin/relayd") - rv.dsl = fs.access("/sbin/vdsl_cpe_control") + rv.dsl = fs.access("/sbin/dsl_cpe_control") or fs.access("/sbin/vdsl_cpe_control") local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep", "wps" } @@ -442,7 +447,7 @@ local methods = { call = function(args) local util = require "luci.util" return { - result = (os.execute("(echo %s; sleep 1; echo %s) | passwd %s >/dev/null 2>&1" %{ + result = (os.execute("(echo %s; sleep 1; echo %s) | /bin/busybox passwd %s >/dev/null 2>&1" %{ luci.util.shellquote(args.password), luci.util.shellquote(args.password), luci.util.shellquote(args.username) diff --git a/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json b/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json index 2a99684c2c..605c7ab777 100644 --- a/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json +++ b/modules/luci-base/root/usr/share/luci/menu.d/luci-base.json @@ -7,7 +7,7 @@ "recurse": true }, "auth": { - "methods": [ "cookie:sysauth" ], + "methods": [ "cookie:sysauth_https", "cookie:sysauth_http" ], "login": true } }, @@ -115,7 +115,7 @@ "post": true }, "auth": { - "methods": [ "cookie:sysauth" ] + "methods": [ "cookie:sysauth_https", "cookie:sysauth_http" ] } }, @@ -128,7 +128,7 @@ "post": true }, "auth": { - "methods": [ "cookie:sysauth" ] + "methods": [ "cookie:sysauth_https", "cookie:sysauth_http" ] } }, |