modules/admin-mini: merge new upgrade pages
[project/luci.git] / modules / admin-mini / luasrc / controller / mini / system.lua
index 3b3fea228d1ea90e12f0e15163b4505d00ce09d1..ad15b076b0639fd9e3fb5c933411c477610d2fbd 100644 (file)
@@ -19,10 +19,54 @@ function index()
        luci.i18n.loadc("admin-core")
        local i18n = luci.i18n.translate
 
-       entry({"mini", "system"}, call("action_reboot"), i18n("system"))
-       entry({"admin", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw"), 10)
-       entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 20)
-       entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 30)
+       entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40).index = true
+       entry({"mini", "system", "index"}, cbi("mini/system", {autoapply=true}), i18n("general"), 1)
+       entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10)
+       entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80)
+       entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 90)
+       entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 100)
+end
+
+function action_backup()
+       local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
+       local restore_cmd = "gunzip | tar -xC/ >/dev/null 2>&1"
+       local backup_cmd  = "tar -c %s | gzip 2>/dev/null"
+       
+       local restore_fpi 
+       luci.http.setfilehandler(
+               function(meta, chunk, eof)
+                       if not restore_fpi then
+                               restore_fpi = io.popen(restore_cmd, "w")
+                       end
+                       if chunk then
+                               restore_fpi:write(chunk)
+                       end
+                       if eof then
+                               restore_fpi:close()
+                       end
+               end
+       )
+                 
+       local upload = luci.http.formvalue("archive")
+       local backup = luci.http.formvalue("backup")
+       local reset  = reset_avail and luci.http.formvalue("reset")
+       
+       if upload and #upload > 0 then
+               luci.template.render("mini/applyreboot")
+               luci.sys.reboot()
+       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-%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
+               luci.template.render("mini/applyreboot")
+               luci.util.exec("mtd -r erase rootfs_data")
+       else
+               luci.template.render("mini/backup", {reset_avail = reset_avail})
+       end
 end
 
 function action_reboot()
@@ -36,57 +80,130 @@ end
 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 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
+               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 = luci.http.formvalue("keepcfg")
-
-       if plat and fname then
-               local kpattern = nil
-               if keepcfg then
-                       local files = luci.model.uci.get_all("luci", "flash_keep")
-                       if files.luci and files.luci.flash_keep then
-                               kpattern = ""
-                               for k,v in pairs(files.luci.flash_keep) do
-                                       kpattern = kpattern .. " " ..  v
-                               end
-                       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
+                       -- Next line is to bypass luci.http layer
+                       luci.http.context.eoh = true
+
+                       -- Now invoke sysupgrade
+                       local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
+                       os.execute("/sbin/luci-flash %s %q" %{
+                               keepcfg and "-k %q" % _keep_pattern() or "", tmpfile
+                       })
+
+                       -- Make sure the device is rebooted
+                       luci.sys.reboot()
                end
-               ret = luci.sys.flash(tmpfile, kpattern)
-       end
 
-       luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret})
-end
 
-function action_passwd()
-       local p1 = luci.http.formvalue("pwd1")
-       local p2 = luci.http.formvalue("pwd2")
-       local stat = nil
+       --
+       -- This is step 1-3, which does the user interaction and
+       -- image upload.
+       --
 
-       if p1 or p2 then
-               if p1 == p2 then
-                       stat = luci.sys.user.setpasswd("root", p1)
-               else
-                       stat = 10
+       -- 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
-       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
 
-       luci.template.render("mini/passwd", {stat=stat})
-end
\ No newline at end of file
+function _keep_pattern()
+       local kpattern = ""
+       local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
+       if files then
+               kpattern = ""
+               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