nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-luci-admin: system.lua -> upgrade.lua

Browse Source
This commit is contained in:
Nils Schneider 2014-02-19 02:50:52 +01:00
parent 6a2e7d45d8
commit 9c2ba883c9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/system.lua → package/gluon-luci-admin/files/usr/lib/lua/luci/controller/admin/upgrade.lua
View File

@ -13,7 +13,7 @@ You may obtain a copy of the License at
$Id$ $Id$
]]-- ]]--
module("luci.controller.admin.system", package.seeall) module("luci.controller.admin.upgrade", package.seeall)
function index() function index()
entry({"admin", "passwd"}, cbi("admin/passwd"), "Admin Password", 10) entry({"admin", "passwd"}, cbi("admin/passwd"), "Admin Password", 10)
@ -24,7 +24,7 @@ function action_upgrade()
require("luci.model.uci") require("luci.model.uci")
local tmpfile = "/tmp/firmware.img" local tmpfile = "/tmp/firmware.img"
local function image_supported() local function image_supported()
-- XXX: yay... -- XXX: yay...
return ( 0 == os.execute( return ( 0 == os.execute(
@ -34,11 +34,11 @@ function action_upgrade()
% tmpfile % tmpfile
) ) ) )
end end
local function image_checksum() local function image_checksum()
return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)")) return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)"))
end end
local function storage_size() local function storage_size()
local size = 0 local size = 0
if nixio.fs.access("/proc/mtd") then if nixio.fs.access("/proc/mtd") then
@ -86,7 +86,7 @@ function action_upgrade()
local has_support = image_supported() local has_support = image_supported()
local has_platform = nixio.fs.access("/lib/upgrade/platform.sh") local has_platform = nixio.fs.access("/lib/upgrade/platform.sh")
local has_upload = luci.http.formvalue("image") local has_upload = luci.http.formvalue("image")
-- --
-- This is step 1-3, which does the user interaction and -- This is step 1-3, which does the user interaction and
-- image upload. -- image upload.
@ -99,7 +99,7 @@ function action_upgrade()
if has_image then if has_image then
nixio.fs.unlink(tmpfile) nixio.fs.unlink(tmpfile)
end end
luci.template.render("admin/upgrade", { luci.template.render("admin/upgrade", {
step=1, step=1,
bad_image=(has_image and not has_support or false), bad_image=(has_image and not has_support or false),
@ -116,7 +116,7 @@ function action_upgrade()
flashsize=storage_size(), flashsize=storage_size(),
keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1") keepconfig=(keep_avail and luci.http.formvalue("keepcfg") == "1")
} ) } )
-- Step 3: load iframe which calls the actual flash procedure -- Step 3: load iframe which calls the actual flash procedure
elseif step == 3 then elseif step == 3 then
-- invoke sysupgrade -- invoke sysupgrade