Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-mod-admin-full: handle missing size for block devices

Browse source 
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
This commit is contained in:
Jo-Philipp Wich 2015-04-17 12:34:54 +02:00
parent 622cfc673a
commit ec09e995a8
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
View file

@ -87,24 +87,30 @@ dev.cfgvalue = function(self, section)
v = m.uci:get("fstab", section, "uuid") v = m.uci:get("fstab", section, "uuid")
e = v and devices[v:lower()] e = v and devices[v:lower()]
if v and e then if v and e and e.size then
return "UUID: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size } return "UUID: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size }
elseif v and e then
return "UUID: %s (%s)" %{ tp.pcdata(v), e.dev }
elseif v then elseif v then
return "UUID: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") } return "UUID: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
end end
v = m.uci:get("fstab", section, "label") v = m.uci:get("fstab", section, "label")
e = v and devices[v] e = v and devices[v]
if v and e then if v and e and e.size then
return "Label: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size } return "Label: %s (%s, %d MB)" %{ tp.pcdata(v), e.dev, e.size }
elseif v and e then
return "Label: %s (%s)" %{ tp.pcdata(v), e.dev }
elseif v then elseif v then
return "Label: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") } return "Label: %s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
end end
v = Value.cfgvalue(self, section) or "?" v = Value.cfgvalue(self, section) or "?"
e = v and devices[v] e = v and devices[v]
if v and e then if v and e and e.size then
return "%s (%d MB)" %{ tp.pcdata(v), e.size } return "%s (%d MB)" %{ tp.pcdata(v), e.size }
elseif v and e then
return tp.pcdata(v)
elseif v then elseif v then
return "%s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") } return "%s (<em>%s</em>)" %{ tp.pcdata(v), translate("not present") }
end end

14
modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
View file

@ -57,8 +57,10 @@ o = mount:taboption("general", Value, "uuid", translate("UUID"),
translate("If specified, mount the device by its UUID instead of a fixed device node")) translate("If specified, mount the device by its UUID instead of a fixed device node"))
for i, d in ipairs(devices) do for i, d in ipairs(devices) do
if d.uuid then if d.uuid and d.size then
o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size }) o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size })
elseif d.uuid then
o:value(d.uuid, "%s (%s)" %{ d.uuid, d.dev })
end end
end end
@ -71,8 +73,10 @@ o = mount:taboption("general", Value, "label", translate("Label"),
o:depends("uuid", "") o:depends("uuid", "")
for i, d in ipairs(devices) do for i, d in ipairs(devices) do
if d.label then if d.label and d.size then
o:value(d.label, "%s (%s, %d MB)" %{ d.label, d.dev, d.size }) o:value(d.label, "%s (%s, %d MB)" %{ d.label, d.dev, d.size })
elseif d.label then
o:value(d.label, "%s (%s)" %{ d.label, d.dev })
end end
end end
@ -85,7 +89,11 @@ o = mount:taboption("general", Value, "device", translate("Device"),
o:depends({ uuid = "", label = "" }) o:depends({ uuid = "", label = "" })
for i, d in ipairs(devices) do for i, d in ipairs(devices) do
o:value(d.dev, "%s (%d MB)" %{ d.dev, d.size }) if d.size then
o:value(d.dev, "%s (%d MB)" %{ d.dev, d.size })
else
o:value(d.dev)
end
end end