X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fluci-mod-admin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Ffstab.lua;h=3ce5351bf0efa54a1a8bd9e2e2c548aad820fb5f;hb=edd1fab34eaa98be624bbba17f60a8ae63744a98;hp=8ac3d6d5e77bc31567b6b95b4061e88c2890959a;hpb=1bb4822dca6113f73e3bc89e2acf15935e6f8e92;p=project%2Fluci.git 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 8ac3d6d5e..3ce5351bf 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 @@ -1,40 +1,99 @@ ---[[ -LuCI - Lua Configuration Interface +-- Copyright 2008 Steven Barth +-- Licensed to the public under the Apache License 2.0. -Copyright 2008 Steven Barth +require("luci.tools.webadmin") -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +local fs = require "nixio.fs" +local util = require "nixio.util" +local tp = require "luci.template.parser" - http://www.apache.org/licenses/LICENSE-2.0 +local block = io.popen("block info", "r") +local ln, dev, devices = nil, nil, {} -$Id$ -]]-- +repeat + ln = block:read("*l") + dev = ln and ln:match("^/dev/(.-):") -require("luci.tools.webadmin") + if dev then + local e, s, key, val = { } -local fs = require "nixio.fs" -local util = require "nixio.util" + for key, val in ln:gmatch([[(%w+)="(.-)"]]) do + e[key:lower()] = val + devices[val] = e + end -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) + s = tonumber((fs.readfile("/sys/class/block/%s/size" % dev))) -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 + 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 + +detect = s:option(Button, "block_detect", translate("Generate Config"), translate("Find all currently attached filesystems and swap and replace configuration with defaults based on what was detected")) +detect.inputstyle = "reload" + +detect.write = function(self, section) + luci.sys.call("block detect >/etc/config/fstab") + luci.http.redirect(luci.dispatcher.build_url("admin/system", "fstab")) +end + +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 filesystems 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")) @@ -57,7 +116,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 @@ -77,17 +150,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")) @@ -101,7 +196,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")) @@ -111,8 +214,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")) @@ -150,7 +259,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