modules/admin-full: Added list of mounted file systems to fstab configuration page

diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua
index 2ed26211054e7606a182e432cc16bf351a33e503..26e203914337b475cfc462f98743bfb31f4f7540 100644 (file)
--- a/i18n/english/luasrc/i18n/admin-core.en.lua
+++ b/i18n/english/luasrc/i18n/admin-core.en.lua
@@ -80,6 +80,10 @@ a_s_sshkeys1 = "Here you can paste public SSH-Keys (one per line) for SSH public
 a_s_fstab_mountpoints = "Mount Points"
 a_s_fstab_mountpoints1 = "Mount Points define at which point a memory device will be attached to the filesystem"
 
+a_s_fstab_active = "Mounted file systems"
+a_s_fstab_used = "Used"
+a_s_fstab_avail = "Available"
+
 a_s_fstab_mountpoint = "Mount Point"
 a_s_fstab_device1 = "The device file of the memory or partition (e.g. /dev/sda1)"
 a_s_fstab_fs1 = "The filesystem that was used to format the memory (e.g. ext3)"

diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua
index 81c5c25eab36b5efef600917c50f43ae1dbdbe3e..64a9b550201c4cf74cf14eae0fac8a1c653300e1 100644 (file)
--- a/i18n/english/luasrc/i18n/default.en.lua
+++ b/i18n/english/luasrc/i18n/default.en.lua
@@ -90,6 +90,7 @@ saveapply = "Save & Apply"
 service = "Service"
 services = "Services"
 settings = "Settings"
+size = "Size"
 start = "Start"
 static = "static"
 status = "Status"

diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua
index 364858aa98da943af9d29a6a27829174d75f93c2..76f0a998aa14caa7a961617ed355369240ab844b 100644 (file)
--- a/i18n/german/luasrc/i18n/admin-core.de.lua
+++ b/i18n/german/luasrc/i18n/admin-core.de.lua
@@ -63,6 +63,9 @@ a_s_flash_notimplemented = [[Diese Funktion steht leider (noch) nicht zur Verfü
 a_s_flash_upgrade1 = [[Ersetzt die installierte Firmware (das Betriebssystem des Routers) durch ein neues.
 Das Format der Firmware ist plattformabhängig.]]
 a_s_fstab = [[Einhängepunkte]]
+a_s_fstab_active = "Eingehängte Dateisysteme"
+a_s_fstab_used = "Benutzt"
+a_s_fstab_avail = "Verfügbar"
 a_s_fstab_device1 = [[Die Gerätedatei des Speichers oder der Partition (z.B.: /dev/sda)]]
 a_s_fstab_fs1 = [[Das Dateisystem mit dem der Speicher formatiert ist (z.B.: ext3)]]
 a_s_fstab_mountpoint = [[Einhängepunkt]]

diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua
index 339f2e96bc7d4b5ef35ff4a465645ec5811a2a72..c0c9e43d5c6b50f1ba426dfef9665c99bfe4f9d9 100644 (file)
--- a/i18n/german/luasrc/i18n/default.de.lua
+++ b/i18n/german/luasrc/i18n/default.de.lua
@@ -91,6 +91,7 @@ saveapply = "Speichern & Anwenden"
 service = "Dienst"
 services = "Dienste"
 settings = "Einstellungen"
+size = "Größe"
 start = "Start"
 static = "statisch"
 statistics = "Statistiken"

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 6d1f057c97be4ff52dd0ea10c52a03493cfd02b8..7aaaac832b69b0ae8c5247f27e5d25b7052bbf66 100644 (file)
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -11,8 +11,53 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
+require("luci.tools.webadmin")
 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
+
+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
+       ) .. " / " .. luci.tools.webadmin.byte_format(
+        tonumber(mounts[section].blocks) * 1024
+       )
+end
+
+used = v:option(DummyValue, "used", translate("a_s_fstab_used"))
+function used.cfgvalue(self, section)
+       return mounts[section].percent .. " (" ..
+       luci.tools.webadmin.byte_format(
+        tonumber(mounts[section].used) * 1024
+       ) .. ")"
+end
+
+
+
 mount = m:section(TypedSection, "mount", translate("a_s_fstab_mountpoints"), translate("a_s_fstab_mountpoints1"))
 mount.anonymous = true
 mount.addremove = true