mirror of https://git.openwrt.org/project/luci.git
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
This commit is contained in:
Steven Barth
parent
e3097c4df3
commit
f26e93bead
|
|
@ -100,6 +100,18 @@ a_s_reboot_do = "Perform reboot"
|
|||
a_s_reboot_running = "Please wait: Device rebooting..."
|
||||
a_s_reboot_u = "Warning: There are unsaved changes that will be lost while rebooting!"
|
||||
|
||||
a_s_applyreboot1 = "Changes applied."
|
||||
|
||||
a_s_backup = "Backup / Restore"
|
||||
a_s_backup_backup = "Create backup"
|
||||
a_s_backup_archive = "Backup Archive"
|
||||
a_s_backup_reset = "Reset router to defaults"
|
||||
a_s_backup_reset1 = "Proceed reverting all settings and resetting to firmware defaults?"
|
||||
a_s_backup_restore = "Restore backup"
|
||||
a_s_backup1 = [[Here you can backup and restore your router configuration
|
||||
and - if possible - reset the router to the default settings.]]
|
||||
|
||||
|
||||
a_srv_http = "HTTP-Server"
|
||||
a_srv_ssh = "SSH-Server"
|
||||
|
||||
|
|
|
|||
|
|
@ -281,4 +281,15 @@ wlanscan = "WLAN-Scan"
|
|||
|
||||
m_n_keepalive = "automatisch neu verbinden"
|
||||
m_n_dialondemand = "trennen bei Inaktivität nach"
|
||||
m_n_pptp_server = "PPTP-Server"
|
||||
m_n_pptp_server = "PPTP-Server"
|
||||
|
||||
a_s_applyreboot1 = "Änderungen angewandt."
|
||||
|
||||
a_s_backup = "Sichern / Wiederherstellen"
|
||||
a_s_backup_backup = "Sicherung erstellen"
|
||||
a_s_backup_archive = "Sicherungsarchiv"
|
||||
a_s_backup_reset = "Grundeinstellungen wiederherstellen"
|
||||
a_s_backup_reset1 = "Alle aktuellen Einstellungen verwerfen und Grundeinstellungen wiederherstellen?"
|
||||
a_s_backup_restore = "Sicherung wiederherstellen"
|
||||
a_s_backup1 = [[Auf dieser Seite können Sicherungen der Konfiguration erstellt und eingespielt werden
|
||||
und - wenn möglich - die Grundeinstellungen wiederhergestellt werden.]]
|
||||
|
|
@ -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
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
$Id$
|
||||
|
||||
-%>
|
||||
<%+header%>
|
||||
<h1><%:system%></h1>
|
||||
<br />
|
||||
<p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
|
||||
<p><%:a_s_reboot_running%></p>
|
||||
<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
|
||||
<%+footer%>
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
$Id$
|
||||
|
||||
-%>
|
||||
<%+header%>
|
||||
<h1><%:system%></h1>
|
||||
<h2><%:a_s_backup%></h2>
|
||||
<p><%:a_s_backup1%></p>
|
||||
<br />
|
||||
<div>
|
||||
<ul>
|
||||
<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_backup%></a></li>
|
||||
<% if reset_avail then -%>
|
||||
<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br />
|
||||
|
||||
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
|
||||
<div class="left"><%:a_s_backup_archive%>:</div>
|
||||
<div>
|
||||
<input type="file" size="30" name="archive" />
|
||||
</div>
|
||||
<div>
|
||||
<input type="submit" value="<%:a_s_backup_restore%>" />
|
||||
</div>
|
||||
</form>
|
||||
<%+footer%>
|
||||
|
|
@ -22,10 +22,52 @@ function index()
|
|||
entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40)
|
||||
entry({"mini", "system", "index"}, cbi("mini/system"), i18n("general"), 1)
|
||||
entry({"mini", "system", "passwd"}, call("action_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("a_s_flash"), 90)
|
||||
entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 100)
|
||||
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("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.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("mini/applyreboot")
|
||||
luci.sys.exec("mtd -r erase rootfs_data")
|
||||
else
|
||||
luci.template.render("mini/backup", {reset_avail = reset_avail})
|
||||
end
|
||||
end
|
||||
|
||||
function action_reboot()
|
||||
local reboot = luci.http.formvalue("reboot")
|
||||
luci.template.render("mini/reboot", {reboot=reboot})
|
||||
|
|
@ -60,17 +102,7 @@ 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("mini/upgrade", {sysupgrade=plat, ret=ret})
|
||||
|
|
@ -90,4 +122,16 @@ function action_passwd()
|
|||
end
|
||||
|
||||
luci.template.render("mini/passwd", {stat=stat})
|
||||
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
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
$Id$
|
||||
|
||||
-%>
|
||||
<%+header%>
|
||||
<h1><%:system%></h1>
|
||||
<br />
|
||||
<p><% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %></p>
|
||||
<p><%:a_s_reboot_running%></p>
|
||||
<script type="text/javascript">setTimeout("location='<%=controller%>'", 60000)</script>
|
||||
<%+footer%>
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
<%#
|
||||
LuCI - Lua Configuration Interface
|
||||
Copyright 2008 Steven Barth <steven@midlink.org>
|
||||
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
$Id$
|
||||
|
||||
-%>
|
||||
<%+header%>
|
||||
<h1><%:system%></h1>
|
||||
<h2><%:a_s_backup%></h2>
|
||||
<p><%:a_s_backup1%></p>
|
||||
<br />
|
||||
<div>
|
||||
<ul>
|
||||
<li><a href="<%=REQUEST_URI%>?backup=kthxbye"><%:a_s_backup_backup%></a></li>
|
||||
<% if reset_avail then -%>
|
||||
<li><a href="<%=REQUEST_URI%>?reset=yarly" onclick="return confirm('<%:a_s_backup_reset1%>')"><%:a_s_backup_reset%></a></li>
|
||||
<% end -%>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<br />
|
||||
|
||||
<form method="post" action="<%=REQUEST_URI%>" enctype="multipart/form-data">
|
||||
<div class="left"><%:a_s_backup_archive%>:</div>
|
||||
<div>
|
||||
<input type="file" size="30" name="archive" />
|
||||
</div>
|
||||
<div>
|
||||
<input type="submit" value="<%:a_s_backup_restore%>" />
|
||||
</div>
|
||||
</form>
|
||||
<%+footer%>
|
||||
Loading…
Reference in New Issue