diskman: fix no '-B' option in df of openwrt

lisaac · Feb 7, 2020 · e1584ff · e1584ff
1 parent b99aa85
commit e1584ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/luasrc/model/diskman.lua b/luasrc/model/diskman.lua
@@ -16,7 +16,7 @@ end
 
 local mounts = nixio.fs.readfile("/proc/mounts") or ""
 local swaps = nixio.fs.readfile("/proc/swaps") or ""
-local df = luci.sys.exec(d.command.df .. " -B1") or ""
+local df = luci.sys.exec(d.command.df) or ""
 
 function byte_format(byte)
   local suff = {"B", "KB", "MB", "GB", "TB"}
@@ -143,8 +143,8 @@ local get_partition_usage = function(partition)
   local used, free, usage = df:match("\n/dev/" .. partition .. "%s+%d+%s+(%d+)%s+(%d+)%s+(%d+)%%%s-")
 
   usage = usage and (usage .. "%") or "-"
-  used = used and tonumber(used) or 0
-  free = free and tonumber(free) or 0
+  used = used and (tonumber(used) * 1024) or 0
+  free = free and (tonumber(free) * 1024) or 0
 
   return used, free, usage
 end

diff --git a/po/zh-cn/diskman.po b/po/zh-cn/diskman.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8\n"
 
 msgid "DiskMan"
-msgstr "DiskMan磁盘管理"
+msgstr "DiskMan 磁盘管理"
 
 msgid "Manage Disks over LuCI."
 msgstr "通过LuCI管理磁盘"