modules/admin-full: remove duplicate fallback translation in opkg error reporting

[project/luci.git] / modules / admin-full / luasrc / model / cbi / admin_system / fstab.lua

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
index 7aaaac8..7873842 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -12,47 +12,45 @@ You may obtain a copy of the License at
 $Id$
 ]]--
 require("luci.tools.webadmin")
+
+local fs = require "luci.fs"
+local devices = {}
+luci.util.update(devices, fs.glob("/dev/sd*") or {})
+luci.util.update(devices, fs.glob("/dev/hd*") or {})
+luci.util.update(devices, fs.glob("/dev/scd*") or {})
+luci.util.update(devices, fs.glob("/dev/mmc*") or {})
+
+local size = {}
+for i, dev in ipairs(devices) do
+       local s = tonumber((luci.fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
+       size[dev] = s and math.floor(s / 2048)
+end
+
+
 m = Map("fstab", translate("a_s_fstab"))
 
 local mounts = luci.sys.mounts()
 
-v = m:section(TypedSection, "_virtual", translate("a_s_fstab_active"))
-v.anonymous = true
-v.rowcolors = true
-v.template  = "cbi/tblsection"
-
-function v.cfgsections(self)
-       local sections = {}
-       for i=1,#mounts do
-               table.insert(sections, i)
-       end
-       return sections
-end
+v = m:section(Table, mounts, translate("a_s_fstab_active"))
 
 fs = v:option(DummyValue, "fs", translate("filesystem"))
-function fs.cfgvalue(self, section)
-       return mounts[section].fs
-end
 
 mp = v:option(DummyValue, "mountpoint", translate("a_s_fstab_mountpoint"))
-function mp.cfgvalue(self, section)
-       return mounts[section].mountpoint
-end
 
 avail = v:option(DummyValue, "avail", translate("a_s_fstab_avail"))
 function avail.cfgvalue(self, section)
        return luci.tools.webadmin.byte_format(
-        tonumber(mounts[section].available) * 1024
+               ( tonumber(mounts[section].available) or 0 ) * 1024
        ) .. " / " .. luci.tools.webadmin.byte_format(
-        tonumber(mounts[section].blocks) * 1024
+               ( tonumber(mounts[section].blocks) or 0 ) * 1024
        )
 end
 
 used = v:option(DummyValue, "used", translate("a_s_fstab_used"))
 function used.cfgvalue(self, section)
-       return mounts[section].percent .. " (" ..
+       return ( mounts[section].percent or "0%" ) .. " (" ..
        luci.tools.webadmin.byte_format(
-        tonumber(mounts[section].used) * 1024
+               ( tonumber(mounts[section].used) or 0 ) * 1024
        ) .. ")"
 end
 
@@ -64,7 +62,11 @@ mount.addremove = true
 mount.template = "cbi/tblsection"
 
 mount:option(Flag, "enabled", translate("enable"))
-mount:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+dev = mount:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+for i, d in ipairs(devices) do
+       dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
+end
+
 mount:option(Value, "target", translate("a_s_fstab_mountpoint"))
 mount:option(Value, "fstype", translate("filesystem"), translate("a_s_fstab_fs1"))
 mount:option(Value, "options", translate("options"), translatef("manpage", "siehe '%s' manpage", "mount"))
@@ -76,6 +78,9 @@ swap.addremove = true
 swap.template = "cbi/tblsection"
 
 swap:option(Flag, "enabled", translate("enable"))
-swap:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+dev = swap:option(Value, "device", translate("device"), translate("a_s_fstab_device1"))
+for i, d in ipairs(devices) do
+       dev:value(d, size[d] and "%s (%s MB)" % {d, size[d]})
+end
 
 return m