From 7fe0218bcf20a38423685cad622b18267d304384 Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Thu, 19 Dec 2024 22:38:23 +0000 Subject: [PATCH] luci-base: rename mii-tool object property to mii_tool otherwise ucode function call breaks with: RPC call to luci/getInitList failed with error -32000: Object not found Follow-up fix to ab15b5e379717be5e194bc3992ae13960b973f18 Signed-off-by: Paul Donald --- modules/luci-base/root/usr/share/rpcd/ucode/luci | 2 +- .../htdocs/luci-static/resources/tools/network.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/luci-base/root/usr/share/rpcd/ucode/luci b/modules/luci-base/root/usr/share/rpcd/ucode/luci index de3ca20b8d0..0e3104186cb 100644 --- a/modules/luci-base/root/usr/share/rpcd/ucode/luci +++ b/modules/luci-base/root/usr/share/rpcd/ucode/luci @@ -197,7 +197,7 @@ const methods = { firewall4: access('/sbin/fw4') == true, opkg: access('/bin/opkg') == true, bonding: access('/sys/module/bonding'), - mii-tool: access('/usr/sbin/mii-tool'), + mii_tool: access('/usr/sbin/mii-tool'), offloading: access('/sys/module/xt_FLOWOFFLOAD/refcnt') == true || access('/sys/module/nft_flow_offload/refcnt') == true, br2684ctl: access('/usr/sbin/br2684ctl') == true, swconfig: access('/sbin/swconfig') == true, diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js index e7bfd59fdee..31a2bf029ee 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/tools/network.js @@ -869,7 +869,7 @@ return baseclass.extend({ o.depends('type', 'bonding'); o = this.replaceOption(s, 'devadvanced', form.ListValue, 'monitor_mode', _('Link monitoring mode'), - !L.hasSystemFeature('mii-tool') ? ''+ + !L.hasSystemFeature('mii_tool') ? ''+ _('Install %s').format('mii-tool') + '' : null); o.default = ''; o.value('arp', _('ARP link monitoring'));