diff options
author | Steven Barth <steven@midlink.org> | 2008-08-03 15:01:36 +0000 |
---|---|---|
committer | Steven Barth <steven@midlink.org> | 2008-08-03 15:01:36 +0000 |
commit | f26e93beadda6cc361c4551777f1d728d9ddfa7d (patch) | |
tree | 84fd7adb7caef7123bf5c8943716fda85a223758 /modules/admin-full/luasrc/controller | |
parent | e3097c4df37e0c12246b15c44cb3fc076bc256fe (diff) |
admin-full, admin-mini: Added configuration backup, restore, reset page
admin-full, admin-mini: Fixed a bug in firmware upgrade preventing configuration files from being kept
Diffstat (limited to 'modules/admin-full/luasrc/controller')
-rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 70 |
1 files changed, 57 insertions, 13 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 14fd813c38..01663a4c33 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -24,8 +24,9 @@ function index() entry({"admin", "system", "sshkeys"}, call("action_sshkeys"), i18n("a_s_sshkeys", "SSH-Schlüssel"), 30) entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system", "System"), 40) entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab", "Einhängepunkte"), 50) - entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash", "Firmwareupgrade"), 60) - entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot", "Neu starten"), 70) + entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 60) + entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash", "Firmwareupgrade"), 70) + entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot", "Neu starten"), 80) end function action_editor() @@ -153,6 +154,47 @@ function action_packages() install=install, remove=remove, update=update, upgrade=upgrade}) end +function action_backup() + local reset_avail = luci.sys.exec([[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("admin_system/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.tar.gz"') + 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("admin_system/applyreboot") + luci.sys.exec("mtd -r erase rootfs_data") + else + luci.template.render("admin_system/backup", {reset_avail = reset_avail}) + end +end + function action_passwd() local p1 = luci.http.formvalue("pwd1") local p2 = luci.http.formvalue("pwd2") @@ -221,18 +263,20 @@ function action_upgrade() 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 - end - ret = luci.sys.flash(tmpfile, kpattern) + ret = luci.sys.flash(tmpfile, keepcfg and _keep_pattern()) end luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret}) +end + +function _keep_pattern() + local kpattern = "" + local files = luci.model.uci.get_all("luci", "flash_keep") + if files then + kpattern = "" + for k,v in pairs(files) do + kpattern = kpattern .. " " .. v + end + end + return kpattern end
\ No newline at end of file |