From fb77c8a51af310855c5e91d976263881efbca8a2 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 22 Mar 2022 01:26:41 +0800 Subject: [PATCH] autocore: add ethtool back for x86 Signed-off-by: Tianling Shen --- package/emortal/autocore/Makefile | 2 +- package/emortal/autocore/files/generic/ethinfo | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/emortal/autocore/Makefile b/package/emortal/autocore/Makefile index 552b50196e..1ec08a91f8 100644 --- a/package/emortal/autocore/Makefile +++ b/package/emortal/autocore/Makefile @@ -27,7 +27,7 @@ endef define Package/autocore-x86 TITLE:=x86/x64 auto core loadbalance script MAINTAINER:=Lean - DEPENDS:=@TARGET_x86 +lm-sensors + DEPENDS:=@TARGET_x86 +lm-sensors +ethtool VARIANT:=x86 endef diff --git a/package/emortal/autocore/files/generic/ethinfo b/package/emortal/autocore/files/generic/ethinfo index db457e80bf..336676349c 100755 --- a/package/emortal/autocore/files/generic/ethinfo +++ b/package/emortal/autocore/files/generic/ethinfo @@ -4,11 +4,10 @@ local util = require "luci.util" local jsonc = require "luci.jsonc" - local eth_info = {} local ifname, stat for ifname, stat in pairs(util.ubus("network.device", "status")) do - if ifname:match("^(eth[0-9]+)$") == ifname then + if ifname:match("^(eth%d+)$") == ifname then local status, speed, duplex status = stat.carrier and 1 or 0 @@ -32,8 +31,7 @@ end table.sort(eth_info, function(a, b) - return tonumber(a.name:match("eth([0-9]+)$")) < - tonumber(b.name:match("eth([0-9]+)$")) + return a.name < b.name end) print(jsonc.stringify(eth_info))