Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6048 from dhewg/dsl

Browse source 
remove 'dsl' feature flag
This commit is contained in:
Jo-Philipp Wich 2022-10-21 09:25:14 +02:00 committed by GitHub
commit 497b375eeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/luci-base/root/usr/libexec/rpcd/luci
View file

@ -223,7 +223,6 @@ local methods = {
rv.dropbear = fs.access("/usr/sbin/dropbear") rv.dropbear = fs.access("/usr/sbin/dropbear")
rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt") rv.cabundle = fs.access("/etc/ssl/certs/ca-certificates.crt")
rv.relayd = fs.access("/usr/sbin/relayd") rv.relayd = fs.access("/usr/sbin/relayd")
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" } local wifi_features = { "eap", "11n", "11ac", "11r", "acs", "sae", "owe", "suiteb192", "wep", "wps" }

3
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/50_dsl.js
View file

@ -1,5 +1,6 @@
'use strict'; 'use strict';
'require baseclass'; 'require baseclass';
'require network';
'require rpc'; 'require rpc';
var callDSLMetrics = rpc.declare({ var callDSLMetrics = rpc.declare({
@ -44,7 +45,7 @@ return baseclass.extend({
title: _('DSL'), title: _('DSL'),
load: function() { load: function() {
if (!L.hasSystemFeature('dsl')) if (!network.getDSLModemType())
return Promise.reject(); return Promise.reject();
return L.resolveDefault(callDSLMetrics(), {}); return L.resolveDefault(callDSLMetrics(), {});