diff --git a/package/ctcgfw/luci-app-diskman/Makefile b/package/ctcgfw/luci-app-diskman/Makefile index 472e31a2ec..d040d9fd15 100644 --- a/package/ctcgfw/luci-app-diskman/Makefile +++ b/package/ctcgfw/luci-app-diskman/Makefile @@ -27,9 +27,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include mdadm" default n config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456 + depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include kmod-md-raid456" default n config PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linear + depends on PACKAGE_$(PKG_NAME)_INCLUDE_mdadm bool "Include kmod-md-linear" default n endef @@ -44,9 +46,9 @@ define Package/$(PKG_NAME) +PACKAGE_$(PKG_NAME)_INCLUDE_btrfs_progs:btrfs-progs \ +PACKAGE_$(PKG_NAME)_INCLUDE_lsblk:lsblk \ +PACKAGE_$(PKG_NAME)_INCLUDE_mdadm:mdadm \ - +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-mod \ + +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:mdadm \ +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_raid456:kmod-md-raid456 \ - +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-mod \ + +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:mdadm \ +PACKAGE_$(PKG_NAME)_INCLUDE_kmod_md_linears:kmod-md-linear endef diff --git a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm index 1aa15b80fe..dfb5be7e78 100644 --- a/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm +++ b/package/ctcgfw/luci-app-diskman/luasrc/view/diskman/smart_detail.htm @@ -2,76 +2,79 @@ S.M.A.R.T detail of <%=dev%> -
-
- <%:S.M.A.R.T Attrbutes%>: /dev/<%=dev%> - - - <% if dev:match("nvme") then %> - - <% else %> - - - - - - - - - - <% end %> - - - - -
<%:ID%><%:Attrbute%><%:Flag%><%:Value%><%:Worst%><%:Thresh%><%:Type%><%:Updated%><%:Raw%>

<%:Collecting data...%>
-
+ <% else %> + <%:ID%> + <%:Attrbute%> + <%:Flag%> + <%:Value%> + <%:Worst%> + <%:Thresh%> + <%:Type%> + <%:Updated%> + <%:Raw%> + <% end %> + + +
<%:Collecting data...%>
+ + +
\ No newline at end of file diff --git a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po index 3369fbb9b4..7c1d78a2c6 100644 --- a/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po +++ b/package/ctcgfw/luci-app-diskman/po/zh-cn/diskman.po @@ -71,7 +71,7 @@ msgid "Free Space" msgstr "空闲空间" msgid "Model" -msgstr "主机型号" +msgstr "型号" msgid "Size" msgstr "容量"