diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-04-08 09:15:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 09:15:38 +0200 |
| commit | e331e32b2cd28f98ada2a7c4134ea0b77b9558f0 (patch) | |
| tree | 148759ac7a5de2f58d5fd0d4f015ea31125a7f5e /modules/luci-base | |
| parent | adf0fb1879ffb6bd04984d257484fad0fba1d6a3 (diff) | |
| parent | 3d70d3e5d786383b8754200cf065713b191bdead (diff) | |
Merge pull request #3749 from Ansuel/fix_relayd
luci-base: fix error 404 on missing relay protocol
Diffstat (limited to 'modules/luci-base')
| -rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/network.js | 2 | ||||
| -rwxr-xr-x | modules/luci-base/root/usr/libexec/rpcd/luci | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index 0cd4f29bc4..bca67849b4 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -108,7 +108,7 @@ function getProtocolHandlers(cache) { Object.assign(protos, { none: { no_device: false } }); /* Hack: emulate relayd protocol */ - if (!protos.hasOwnProperty('relay')) + if (!protos.hasOwnProperty('relay') && L.hasSystemFeature('relayd')) Object.assign(protos, { relay: { no_device: true } }); Object.assign(_protospecs, protos); diff --git a/modules/luci-base/root/usr/libexec/rpcd/luci b/modules/luci-base/root/usr/libexec/rpcd/luci index c2be3e92b3..35b85d43d0 100755 --- a/modules/luci-base/root/usr/libexec/rpcd/luci +++ b/modules/luci-base/root/usr/libexec/rpcd/luci @@ -217,6 +217,7 @@ local methods = { rv.ipv6 = fs.access("/proc/net/ipv6_route") rv.dropbear = fs.access("/usr/sbin/dropbear") rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") + rv.relayd = fs.access("/usr/sbin/relayd") local wifi_features = { "eap", "11n", "11ac", "11r", "11w", "acs", "sae", "owe", "suiteb192" } |