$Id$
]]--
+
module("luci.controller.admin.system", package.seeall)
function index()
luci.i18n.loadc("base")
local i18n = luci.i18n.translate
-
+
entry({"admin", "system"}, alias("admin", "system", "system"), i18n("System"), 30).index = true
entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("System"), 1)
entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10)
if nixio.fs.access("/etc/config/fstab") then
entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50)
+ entry({"admin", "system", "fstab", "mount"}, cbi("admin_system/fstab/mount"), nil).leaf = true
+ entry({"admin", "system", "fstab", "swap"}, cbi("admin_system/fstab/swap"), nil).leaf = true
end
if nixio.fs.access("/sys/class/leds") then
-- Search query
local query = luci.http.formvalue("query")
query = (query ~= '') and query or nil
-
-
+
+
-- Packets to be installed
local ninst = submit and luci.http.formvalue("install")
- local uinst = nil
+ local uinst = nil
-- Install from URL
local url = luci.http.formvalue("url")
-- Remove packets
local rem = submit and luci.http.formvalue("remove")
- if rem then
+ if rem then
_, remove[rem] = ipkg.remove(rem)
changes = true
end
-
+
-- Update all packets
local update = luci.http.formvalue("update")
if update then
_, update = ipkg.update()
end
-
-
+
+
-- Upgrade all packets
local upgrade = luci.http.formvalue("upgrade")
if upgrade then
_, upgrade = ipkg.upgrade()
end
-
+
luci.template.render("admin_system/packages", {
query=query, install=install, remove=remove, update=update, upgrade=upgrade
})
-
+
-- Remove index cache
if changes then
nixio.fs.unlink("/tmp/luci-indexcache")
- end
+ end
end
function action_backup()
+ local sys = require "luci.sys"
+ local fs = require "luci.fs"
+
local reset_avail = os.execute([[grep '"rootfs_data"' /proc/mtd >/dev/null 2>&1]]) == 0
local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
- local backup_cmd = "tar -cz %s 2>/dev/null"
+ local backup_cmd = "tar -czT %s 2>/dev/null"
- local restore_fpi
+ local restore_fpi
luci.http.setfilehandler(
function(meta, chunk, eof)
if not restore_fpi then
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
- 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(reader, luci.http.write)
+ local filelist = "/tmp/luci-backup-list.%d" % os.time()
+
+ sys.call(
+ "( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' /etc/sysupgrade.conf " ..
+ "/lib/upgrade/keep.d/* 2>/dev/null) -type f 2>/dev/null; " ..
+ "opkg list-changed-conffiles ) | sort -u > %s" % filelist
+ )
+
+ if fs.access(filelist) then
+ local reader = ltn12_popen(backup_cmd:format(filelist))
+ 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(reader, luci.http.write)
+ fs.unlink(filelist)
+ end
elseif reset then
luci.template.render("admin_system/applyreboot")
luci.util.exec("mtd -r erase rootfs_data")
local p1 = luci.http.formvalue("pwd1")
local p2 = luci.http.formvalue("pwd2")
local stat = nil
-
+
if p1 or p2 then
if p1 == p2 then
stat = luci.sys.user.setpasswd("root", p1)
stat = 10
end
end
-
+
luci.template.render("admin_system/passwd", {stat=stat})
end
require("luci.model.uci")
local tmpfile = "/tmp/firmware.img"
-
+
local function image_supported()
-- XXX: yay...
return ( 0 == os.execute(
% tmpfile
) )
end
-
+
local function image_checksum()
return (luci.sys.exec("md5sum %q" % tmpfile):match("^([^%s]+)"))
end
-
+
local function storage_size()
local size = 0
if nixio.fs.access("/proc/mtd") then
local has_support = image_supported()
local has_platform = nixio.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
+ -- 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
-- Mimetype text/plain
luci.http.prepare_content("text/plain")
- luci.http.write("Starting luci-flash...\n")
+ luci.http.write("Starting sysupgrade...\n")
+
+ io.flush()
-- Now invoke sysupgrade
local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
- local flash = ltn12_popen("/sbin/luci-flash %s %q" %{
- keepcfg and "-k %q" % _keep_pattern() or "", tmpfile
+ local flash = ltn12_popen("/sbin/sysupgrade %s %q" %{
+ keepcfg and "" or "-n", tmpfile
})
luci.ltn12.pump.all(flash, luci.http.write)
-
- -- Make sure the device is rebooted
- luci.sys.reboot()
end
if has_image then
nixio.fs.unlink(tmpfile)
end
-
+
luci.template.render("admin_system/upgrade", {
step=1,
bad_image=(has_image and not has_support or false),
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
-
-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 nixio.fs.glob(v)() then
- kpattern = kpattern .. " " .. v
- end
- end
end
- return kpattern
end
function ltn12_popen(command)