module("luci.controller.admin.system", package.seeall)
function index()
- luci.i18n.loadc("admin-core")
+ luci.i18n.loadc("base")
local i18n = luci.i18n.translate
- entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30).index = true
- entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
- entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
+ entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true
+ entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("System"), 1)
+ entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10)
entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
- entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
- entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
- entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
- entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
+ entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("Admin Password"), 20)
+ entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("<abbr title=\"Secure Shell\">SSH</abbr>-Keys"), 30)
+ entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45)
- if luci.fs.isdirectory("/sys/class/leds") then
- entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+ if nixio.fs.access("/etc/config/fstab") then
+ entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50)
end
- entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
- entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 80)
- entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90)
+ if nixio.fs.access("/sys/class/leds") then
+ entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
+ end
+
+ entry({"admin", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 70)
+ entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 80)
+ entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 90)
end
function action_packages()
local ipkg = require("luci.model.ipkg")
- local void = nil
local submit = luci.http.formvalue("submit")
local changes = false
-
-
+ local install = { }
+ local remove = { }
+
-- Search query
local query = luci.http.formvalue("query")
query = (query ~= '') and query or nil
-- Packets to be installed
- local install = submit and luci.http.formvaluetable("install")
-
+ local ninst = submit and luci.http.formvalue("install")
+ local uinst = nil
+
-- Install from URL
local url = luci.http.formvalue("url")
if url and url ~= '' and submit then
- if not install then
- install = {}
- end
- install[url] = 1
- changes = true
+ uinst = url
end
-
+
-- Do install
- if install then
- for k, v in pairs(install) do
- void, install[k] = ipkg.install(k)
- end
+ if ninst then
+ _, install[ninst] = ipkg.install(ninst)
changes = true
end
-
-
+
+ if uinst then
+ _, install[uinst] = ipkg.install(uinst)
+ changes = true
+ end
+
-- Remove packets
- local remove = submit and luci.http.formvaluetable("remove")
- if remove then
- for k, v in pairs(remove) do
- void, remove[k] = ipkg.remove(k)
- end
+ local rem = submit and luci.http.formvalue("remove")
+ if rem then
+ _, remove[rem] = ipkg.remove(rem)
changes = true
end
-
+
-- Update all packets
local update = luci.http.formvalue("update")
if update then
- void, update = ipkg.update()
+ _, update = ipkg.update()
end
-- Upgrade all packets
local upgrade = luci.http.formvalue("upgrade")
if upgrade then
- void, upgrade = ipkg.upgrade()
+ _, upgrade = ipkg.upgrade()
end
+
-
- -- Package info
- local info = luci.model.ipkg.info(query and "*"..query.."*")
- info = info or {}
- local pkgs = {}
-
- -- Sort after status and name
- for k, v in pairs(info) do
- local x = 0
- for i, j in pairs(pkgs) do
- local vins = (v.Status and v.Status.installed)
- local jins = (j.Status and j.Status.installed)
- if vins ~= jins then
- if vins then
- break
- end
- else
- if j.Package > v.Package then
- break
- end
- end
- x = i
- end
- table.insert(pkgs, x+1, v)
- end
-
- luci.template.render("admin_system/packages", {pkgs=pkgs, query=query,
- install=install, remove=remove, update=update, upgrade=upgrade})
-
+ luci.template.render("admin_system/packages", {
+ query=query, install=install, remove=remove, update=update, upgrade=upgrade
+ })
+
-- Remove index cache
if changes then
- luci.fs.unlink("/tmp/luci-indexcache")
+ nixio.fs.unlink("/tmp/luci-indexcache")
end
end
local function storage_size()
local size = 0
- if luci.fs.access("/proc/mtd") then
+ if nixio.fs.access("/proc/mtd") then
for l in io.lines("/proc/mtd") do
local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
if n == "linux" then
break
end
end
- elseif luci.fs.access("/proc/partitions") then
+ elseif nixio.fs.access("/proc/partitions") then
for l in io.lines("/proc/partitions") do
local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
if b and n and not n:match('[0-9]') then
local file
luci.http.setfilehandler(
function(meta, chunk, eof)
- if not luci.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
+ if not nixio.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
file = io.open(tmpfile, "w")
end
if file and chunk then
-- Determine state
local keep_avail = true
local step = tonumber(luci.http.formvalue("step") or 1)
- local has_image = luci.fs.access(tmpfile)
+ local has_image = nixio.fs.access(tmpfile)
local has_support = image_supported()
- local has_platform = luci.fs.access("/lib/upgrade/platform.sh")
+ local has_platform = nixio.fs.access("/lib/upgrade/platform.sh")
local has_upload = luci.http.formvalue("image")
-- This does the actual flashing which is invoked inside an iframe
if has_platform and has_image and has_support then
-- Mimetype text/plain
luci.http.prepare_content("text/plain")
+ luci.http.write("Starting luci-flash...\n")
-- Now invoke sysupgrade
local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
- local fd = io.popen("/sbin/luci-flash %s %q" %{
+ local flash = ltn12_popen("/sbin/luci-flash %s %q" %{
keepcfg and "-k %q" % _keep_pattern() or "", tmpfile
})
- if fd then
- while true do
- local ln = fd:read("*l")
- if not ln then break end
- luci.http.write(ln .. "\n")
- end
- fd:close()
- end
+ luci.ltn12.pump.all(flash, luci.http.write)
-- Make sure the device is rebooted
luci.sys.reboot()
-- If there is an image but user has requested step 1
-- or type is not supported, then remove it.
if has_image then
- luci.fs.unlink(tmpfile)
+ nixio.fs.unlink(tmpfile)
end
luci.template.render("admin_system/upgrade", {
luci.template.render("admin_system/upgrade", {
step=2,
checksum=image_checksum(),
- filesize=luci.fs.stat(tmpfile).size,
+ filesize=nixio.fs.stat(tmpfile).size,
flashsize=storage_size(),
keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
} )
if files then
kpattern = ""
for k, v in pairs(files) do
- if k:sub(1,1) ~= "." and luci.fs.glob(v) then
+ if k:sub(1,1) ~= "." and nixio.fs.glob(v)() then
kpattern = kpattern .. " " .. v
end
end
projects / project / luci.git / blobdiff