From: Steven Barth <steven@midlink.org>
Date: Thu, 4 Sep 2008 22:03:19 +0000 (+0000)
Subject: Added device hints to fstab configuration page.
X-Git-Tag: 0.8.0~157
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=76145b3e254047aab2a526aa26120025289157c8

Added device hints to fstab configuration page.
---

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 2c2128859..78beed730 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -12,6 +12,21 @@ 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()
@@ -47,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"))
@@ -59,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