projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-mod-admin-full: Fix display problems of mount
[project/luci.git]
/
modules
/
luci-mod-admin-full
/
luasrc
/
model
/
cbi
/
admin_system
/
fstab
/
mount.lua
diff --git
a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
index
f575167
..
a85872a
100644
(file)
--- a/
modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
+++ b/
modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua
@@
-56,6
+56,8
@@
mount:taboption("general", Flag, "enabled", translate("Enable this mount")).rmem
o = mount:taboption("general", Value, "uuid", translate("UUID"),
translate("If specified, mount the device by its UUID instead of a fixed device node"))
o = mount:taboption("general", Value, "uuid", translate("UUID"),
translate("If specified, mount the device by its UUID instead of a fixed device node"))
+o:value("", translate("-- match by uuid --"))
+
for i, d in ipairs(devices) do
if d.uuid and d.size then
o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size })
for i, d in ipairs(devices) do
if d.uuid and d.size then
o:value(d.uuid, "%s (%s, %d MB)" %{ d.uuid, d.dev, d.size })
@@
-64,12
+66,12
@@
for i, d in ipairs(devices) do
end
end
end
end
-o:value("", translate("-- match by label --"))
-
o = mount:taboption("general", Value, "label", translate("Label"),
translate("If specified, mount the device by the partition label instead of a fixed device node"))
o = mount:taboption("general", Value, "label", translate("Label"),
translate("If specified, mount the device by the partition label instead of a fixed device node"))
+o:value("", translate("-- match by label --"))
+
o:depends("uuid", "")
for i, d in ipairs(devices) do
o:depends("uuid", "")
for i, d in ipairs(devices) do
@@
-80,12
+82,12
@@
for i, d in ipairs(devices) do
end
end
end
end
-o:value("", translate("-- match by device --"))
-
o = mount:taboption("general", Value, "device", translate("Device"),
translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
o = mount:taboption("general", Value, "device", translate("Device"),
translate("The device file of the memory or partition (<abbr title=\"for example\">e.g.</abbr> <code>/dev/sda1</code>)"))
+o:value("", translate("-- match by device --"))
+
o:depends({ uuid = "", label = "" })
for i, d in ipairs(devices) do
o:depends({ uuid = "", label = "" })
for i, d in ipairs(devices) do