From: Jo-Philipp Wich Date: Sun, 28 Mar 2010 17:55:35 +0000 (+0000) Subject: modules/admin-mini: sync backup code with admin-full X-Git-Tag: 0.10.0~752 X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=61b9022e51798f389739d1aaf68a0e0231fc4ea7;hp=876b33a1dd3baa9afc3b4fca4d13db47012423d5 modules/admin-mini: sync backup code with admin-full --- diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua index e562af028..797b228c8 100644 --- a/modules/admin-mini/luasrc/controller/mini/system.lua +++ b/modules/admin-mini/luasrc/controller/mini/system.lua @@ -55,12 +55,11 @@ function action_backup() 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") + local reader = ltn12_popen(backup_cmd:format(_keep_pattern())) 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) + luci.ltn12.pump.all(reader, luci.http.write) elseif reset then luci.template.render("mini/applyreboot") luci.util.exec("mtd -r erase rootfs_data")