diff options
author | Daniel Dickinson <cshoredaniel@users.noreply.github.com> | 2017-01-16 10:45:20 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-16 10:45:20 -0500 |
commit | f00a1ac2d98e6063e8bc40f3a6b158a063f008a7 (patch) | |
tree | cb8e2eda275aef6021cd4418c575355b8a5bb5cd /modules/luci-mod-admin-full | |
parent | be28190838b7390727285a28b80372ca7369202d (diff) | |
parent | bc8f58a2ef302f539852b69ac8fab1fd82446b7f (diff) |
Merge pull request #953 from musashino205/mount-fix-disp
luci-mod-admin-full: Fix display problems of mount
Diffstat (limited to 'modules/luci-mod-admin-full')
-rw-r--r-- | modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab/mount.lua | 10 |
1 files changed, 6 insertions, 4 deletions
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 f5751673fd..a85872afad 100644 --- 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: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 }) @@ -64,12 +66,12 @@ for i, d in ipairs(devices) do 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:value("", translate("-- match by label --")) + o:depends("uuid", "") for i, d in ipairs(devices) do @@ -80,12 +82,12 @@ for i, d in ipairs(devices) do 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:value("", translate("-- match by device --")) + o:depends({ uuid = "", label = "" }) for i, d in ipairs(devices) do |