LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008-2009 Jo-Philipp Wich <xm@subsignal.org>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
luci.i18n.loadc("admin-core")
local i18n = luci.i18n.translate
- entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30)
+ 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", "packages", "ipkg"}, form("admin_system/ipkg"), i18n("a_s_p_ipkg"))
+ 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", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+
+ if luci.fs.isdirectory("/sys/class/leds") then
+ entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+ end
+
entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
- entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 80)
+ entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 80)
entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90)
end
local ipkg = require("luci.model.ipkg")
local void = nil
local submit = luci.http.formvalue("submit")
+ local changes = false
-- Search query
install = {}
end
install[url] = 1
+ changes = true
end
-- Do install
for k, v in pairs(install) do
void, install[k] = ipkg.install(k)
end
+ changes = true
end
if remove then
for k, v in pairs(remove) do
void, remove[k] = ipkg.remove(k)
- end
+ end
+ changes = true
end
end
luci.template.render("admin_system/packages", {pkgs=pkgs, query=query,
- install=install, remove=remove, update=update, upgrade=upgrade})
+ install=install, remove=remove, update=update, upgrade=upgrade})
+
+ -- Remove index cache
+ if changes then
+ luci.fs.unlink("/tmp/luci-indexcache")
+ end
end
function action_backup()
elseif backup then
luci.util.perror(backup_cmd:format(_keep_pattern()))
local backup_fpi = io.popen(backup_cmd:format(_keep_pattern()), "r")
- luci.http.header('Content-Disposition', 'attachment; filename="backup.tar.gz"')
+ luci.http.header('Content-Disposition', 'attachment; filename="backup-%s-%s.tar.gz"' % {
+ luci.sys.hostname(), os.date("%Y-%m-%d")})
luci.http.prepare_content("application/x-targz")
luci.ltn12.pump.all(luci.ltn12.source.file(backup_fpi), luci.http.write)
elseif reset then
function action_upgrade()
require("luci.model.uci")
- local ret = nil
- local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
local tmpfile = "/tmp/firmware.img"
- local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
-
- local keep_avail = not broadcom
+
+ local function image_supported()
+ -- XXX: yay...
+ return ( 0 == os.execute(
+ ". /etc/functions.sh; " ..
+ "include /lib/upgrade; " ..
+ "platform_check_image %q >/dev/null"
+ % tmpfile
+ ) )
+ end
+
+ local function image_checksum()
+ return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)"))
+ end
+
+ local function storage_size()
+ local size = 0
+ if luci.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
+ size = tonumber(s, 16)
+ break
+ end
+ end
+ elseif luci.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
+ size = tonumber(b) * 1024
+ break
+ end
+ end
+ end
+ return size
+ end
+
+ -- Install upload handler
local file
luci.http.setfilehandler(
function(meta, chunk, eof)
- if not file then
+ if not luci.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
file = io.open(tmpfile, "w")
end
- if chunk then
+ if file and chunk then
file:write(chunk)
end
- if eof then
+ if file and eof then
file:close()
end
end
)
- local fname = luci.http.formvalue("image")
- local keepcfg = keep_avail and luci.http.formvalue("keepcfg")
- if plat and fname then
- ret = luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
- end
+ -- Determine state
+ local keep_avail = true
+ local step = tonumber(luci.http.formvalue("step") or 1)
+ local has_image = luci.fs.access(tmpfile)
+ local has_support = image_supported()
+ local has_platform = luci.fs.access("/lib/upgrade/platform.sh")
+ local has_upload = luci.http.formvalue("image")
+
+ -- This does the actual flashing which is invoked inside an iframe
+ -- so don't produce meaningful errors here because the the
+ -- previous pages should arrange the stuff as required.
+ if step == 4 then
+ if has_platform and has_image and has_support then
+ -- Mimetype text/plain
+ luci.http.prepare_content("text/plain")
+
+ -- Now invoke sysupgrade
+ local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
+ local fd = io.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)
+ end
+ fd:close()
+ end
- luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
+ -- Make sure the device is rebooted
+ luci.sys.reboot()
+ end
+
+
+ --
+ -- This is step 1-3, which does the user interaction and
+ -- image upload.
+ --
+
+ -- Step 1: file upload, error on unsupported image format
+ elseif not has_image or not has_support or step == 1 then
+ -- 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)
+ end
+
+ luci.template.render("admin_system/upgrade", {
+ step=1,
+ bad_image=(has_image and not has_support or false),
+ keepavail=keep_avail,
+ supported=has_platform
+ } )
+
+ -- Step 2: present uploaded file, show checksum, confirmation
+ elseif step == 2 then
+ luci.template.render("admin_system/upgrade", {
+ step=2,
+ checksum=image_checksum(),
+ filesize=luci.fs.stat(tmpfile).size,
+ flashsize=storage_size(),
+ keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
+ } )
+
+ -- Step 3: load iframe which calls the actual flash procedure
+ elseif step == 3 then
+ luci.template.render("admin_system/upgrade", {
+ step=3,
+ keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
+ } )
+ end
end
function _keep_pattern()
local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
if files then
kpattern = ""
- for k,v in pairs(files) do
- kpattern = kpattern .. " " .. v
+ for k, v in pairs(files) do
+ if k:sub(1,1) ~= "." and luci.fs.glob(v) then
+ kpattern = kpattern .. " " .. v
+ end
end
end
return kpattern
-end
\ No newline at end of file
+end
projects / project / luci.git / blobdiff