X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Ffstab.lua;h=e6f207b2e8ffa12779f8394b35a30d65964eac7f;hp=06e1e0798017e539b38a956d0973d18b2809459e;hb=89f74f77dab023393832a91551aca6e8a02030fb;hpb=7a3493b1f7d75a3945279115324cf2ff4da26b7b
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
index 06e1e0798..e6f207b2e 100644
--- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
+++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_system/fstab.lua
@@ -5,25 +5,88 @@ require("luci.tools.webadmin")
local fs = require "nixio.fs"
local util = require "nixio.util"
+local tp = require "luci.template.parser"
-local devices = {}
-util.consume((fs.glob("/dev/sd*")), devices)
-util.consume((fs.glob("/dev/hd*")), devices)
-util.consume((fs.glob("/dev/scd*")), devices)
-util.consume((fs.glob("/dev/mmc*")), devices)
+local block = io.popen("block info", "r")
+local ln, dev, devices = nil, nil, {}
-local size = {}
-for i, dev in ipairs(devices) do
- local s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev:sub(6))))
- size[dev] = s and math.floor(s / 2048)
-end
+repeat
+ ln = block:read("*l")
+ dev = ln and ln:match("^/dev/(.-):")
+
+ if dev then
+ local e, s, key, val = { }
+
+ for key, val in ln:gmatch([[(%w+)="(.-)"]]) do
+ e[key:lower()] = val
+ devices[val] = e
+ end
+
+ s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev)))
+
+ e.dev = "/dev/%s" % dev
+ e.size = s and math.floor(s / 2048)
+
+ devices[e.dev] = e
+ end
+until not ln
+
+block:close()
m = Map("fstab", translate("Mount Points"))
+s = m:section(TypedSection, "global", translate("Global Settings"))
+s.addremove = false
+s.anonymous = true
+
+o = s:option(Flag, "anon_swap", translate("Anonymous Swap"), translate("Mount swap not specifically configured"))
+o.default = o.disabled
+o.rmempty = false
+
+o = s:option(Flag, "anon_mount", translate("Anonymous Mount"), translate("Mount filesystems not specifically configured"))
+o.default = o.disabled
+o.rmempty = false
+
+o = s:option(Flag, "auto_swap", translate("Automount Swap"), translate("Automatically mount swap on hotplug"))
+o.default = o.enabled
+o.rmempty = false
+
+o = s:option(Flag, "auto_mount", translate("Automount Filesystem"), translate("Automatically mount filesystems on hotplug"))
+o.default = o.enabled
+o.rmempty = false
+
+o = s:option(Flag, "check_fs", translate("Check fileystems before mount"), translate("Automatically check filesystem for errors before mounting"))
+o.default = o.disabled
+o.rmempty = false
local mounts = luci.sys.mounts()
+local non_system_mounts = {}
+for rawmount, val in pairs(mounts) do
+ if (string.find(val.mountpoint, "/tmp/.jail") == nil) then
+ repeat
+ val.umount = false
+ if (val.mountpoint == "/") then
+ break
+ elseif (val.mountpoint == "/overlay") then
+ break
+ elseif (val.mountpoint == "/rom") then
+ break
+ elseif (val.mountpoint == "/tmp") then
+ break
+ elseif (val.mountpoint == "/tmp/shm") then
+ break
+ elseif (val.mountpoint == "/tmp/upgrade") then
+ break
+ elseif (val.mountpoint == "/dev") then
+ break
+ end
+ val.umount = true
+ until true
+ non_system_mounts[rawmount] = val
+ end
+end
-v = m:section(Table, mounts, translate("Mounted file systems"))
+v = m:section(Table, non_system_mounts, translate("Mounted file systems"))
fs = v:option(DummyValue, "fs", translate("Filesystem"))
@@ -46,7 +109,21 @@ function used.cfgvalue(self, section)
) .. ")"
end
+unmount = v:option(Button, "unmount", translate("Unmount"))
+unmount.render = function(self, section, scope)
+ if non_system_mounts[section].umount then
+ self.title = translate("Unmount")
+ self.inputstyle = "remove"
+ Button.render(self, section, scope)
+ end
+end
+unmount.write = function(self, section)
+ if non_system_mounts[section].umount then
+ luci.sys.call("/bin/umount '%s'" % luci.util.shellstartsqescape(non_system_mounts[section].mountpoint))
+ return luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab"))
+ end
+end
mount = m:section(TypedSection, "mount", translate("Mount Points"), translate("Mount Points define at which point a memory device will be attached to the filesystem"))
mount.anonymous = true
@@ -66,17 +143,39 @@ end
mount:option(Flag, "enabled", translate("Enabled")).rmempty = false
dev = mount:option(DummyValue, "device", translate("Device"))
+dev.rawhtml = true
dev.cfgvalue = function(self, section)
- local v
+ local v, e
v = m.uci:get("fstab", section, "uuid")
- if v then return "UUID: %s" % v end
+ e = v and devices[v:lower()]
+ if v and e and e.size then
+ 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
+ return "UUID: %s (%s)" %{ tp.pcdata(v), translate("not present") }
+ end
v = m.uci:get("fstab", section, "label")
- if v then return "Label: %s" % v end
+ e = v and devices[v]
+ if v and e and e.size then
+ 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
+ return "Label: %s (%s)" %{ tp.pcdata(v), translate("not present") }
+ end
v = Value.cfgvalue(self, section) or "?"
- return size[v] and "%s (%s MB)" % {v, size[v]} or v
+ e = v and devices[v]
+ if v and e and e.size then
+ return "%s (%d MB)" %{ tp.pcdata(v), e.size }
+ elseif v and e then
+ return tp.pcdata(v)
+ elseif v then
+ return "%s (%s)" %{ tp.pcdata(v), translate("not present") }
+ end
end
mp = mount:option(DummyValue, "target", translate("Mount Point"))
@@ -90,7 +189,15 @@ end
fs = mount:option(DummyValue, "fstype", translate("Filesystem"))
fs.cfgvalue = function(self, section)
- return Value.cfgvalue(self, section) or "?"
+ local v, e
+
+ v = m.uci:get("fstab", section, "uuid")
+ v = v and v:lower() or m.uci:get("fstab", section, "label")
+ v = v or m.uci:get("fstab", section, "device")
+
+ e = v and devices[v]
+
+ return e and e.type or m.uci:get("fstab", section, "fstype") or "?"
end
op = mount:option(DummyValue, "options", translate("Options"))
@@ -100,8 +207,14 @@ end
rf = mount:option(DummyValue, "is_rootfs", translate("Root"))
rf.cfgvalue = function(self, section)
- return Value.cfgvalue(self, section) == "1"
- and translate("yes") or translate("no")
+ local target = m.uci:get("fstab", section, "target")
+ if target == "/" then
+ return translate("yes")
+ elseif target == "/overlay" then
+ return translate("overlay")
+ else
+ return translate("no")
+ end
end
ck = mount:option(DummyValue, "enabled_fsck", translate("Check"))
@@ -139,7 +252,12 @@ dev.cfgvalue = function(self, section)
if v then return "Label: %s" % v end
v = Value.cfgvalue(self, section) or "?"
- return size[v] and "%s (%s MB)" % {v, size[v]} or v
+ e = v and devices[v]
+ if v and e and e.size then
+ return "%s (%s MB)" % {v, e.size}
+ else
+ return v
+ end
end
return m