X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fsystem.lua;h=95961f49db4dbfe4b46d3dd8174c7518777016f1;hb=831654f504c7a9ef8efc9286e1f09cf942ce05c8;hp=31f4361e46cf02607d4ccc1d66e794fd1bd1a54f;hpb=7c765875884d6866c53b63757731b079bace2e9b;p=project%2Fluci.git
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 31f4361e4..95961f49d 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -12,12 +12,13 @@ You may obtain a copy of the License at
$Id$
]]--
+
module("luci.controller.admin.system", package.seeall)
function index()
- luci.i18n.loadc("admin-core")
+ 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)
@@ -25,7 +26,12 @@ function index()
entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("Admin Password"), 20)
entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("SSH-Keys"), 30)
entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("Processes"), 45)
- entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("Mount Points"), 50)
+
+ 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
entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("LED Configuration"), 60)
@@ -38,102 +44,78 @@ end
function action_packages()
local ipkg = require("luci.model.ipkg")
- local void = nil
local submit = luci.http.formvalue("submit")
local changes = false
-
-
+ local install = { }
+ local remove = { }
+
-- Search query
local query = luci.http.formvalue("query")
query = (query ~= '') and query or nil
-
-
+
+
-- Packets to be installed
- local install = submit and luci.http.formvaluetable("install")
-
+ local ninst = submit and luci.http.formvalue("install")
+ local uinst = nil
+
-- Install from URL
local url = luci.http.formvalue("url")
if url and url ~= '' and submit then
- if not install then
- install = {}
- end
- install[url] = 1
- changes = true
+ uinst = url
end
-
+
-- Do install
- if install then
- for k, v in pairs(install) do
- void, install[k] = ipkg.install(k)
- end
+ if ninst then
+ _, install[ninst] = ipkg.install(ninst)
changes = true
end
-
-
+
+ if uinst then
+ _, install[uinst] = ipkg.install(uinst)
+ changes = true
+ end
+
-- Remove packets
- local remove = submit and luci.http.formvaluetable("remove")
- if remove then
- for k, v in pairs(remove) do
- void, remove[k] = ipkg.remove(k)
- end
+ local rem = submit and luci.http.formvalue("remove")
+ if rem then
+ _, remove[rem] = ipkg.remove(rem)
changes = true
end
-
-
+
+
-- Update all packets
local update = luci.http.formvalue("update")
if update then
- void, update = ipkg.update()
+ _, update = ipkg.update()
end
-
-
+
+
-- Upgrade all packets
local upgrade = luci.http.formvalue("upgrade")
if upgrade then
- void, upgrade = ipkg.upgrade()
+ _, upgrade = ipkg.upgrade()
end
-
-
- -- Package info
- local info = luci.model.ipkg.info(query and "*"..query.."*")
- info = info or {}
- local pkgs = {}
-
- -- Sort after status and name
- for k, v in pairs(info) do
- local x = 0
- for i, j in pairs(pkgs) do
- local vins = (v.Status and v.Status.installed)
- local jins = (j.Status and j.Status.installed)
- if vins ~= jins then
- if vins then
- break
- end
- else
- if j.Package > v.Package then
- break
- end
- end
- x = i
- end
- table.insert(pkgs, x+1, v)
- end
-
- luci.template.render("admin_system/packages", {pkgs=pkgs, query=query,
- install=install, remove=remove, update=update, upgrade=upgrade})
-
+
+
+ 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
@@ -147,20 +129,31 @@ function action_backup()
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")
@@ -173,7 +166,7 @@ function action_passwd()
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)
@@ -181,7 +174,7 @@ function action_passwd()
stat = 10
end
end
-
+
luci.template.render("admin_system/passwd", {stat=stat})
end
@@ -197,7 +190,7 @@ function action_upgrade()
require("luci.model.uci")
local tmpfile = "/tmp/firmware.img"
-
+
local function image_supported()
-- XXX: yay...
return ( 0 == os.execute(
@@ -207,11 +200,11 @@ function action_upgrade()
% 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
@@ -259,32 +252,25 @@ function action_upgrade()
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 sysupgrade...\n")
+
+ io.flush()
-- Now invoke sysupgrade
local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
- local fd = io.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
})
- if fd then
- while true do
- local ln = fd:read("*l")
- if not ln then break end
- luci.http.write(ln .. "\n")
- end
- fd:close()
- end
-
- -- Make sure the device is rebooted
- luci.sys.reboot()
+ luci.ltn12.pump.all(flash, luci.http.write)
end
@@ -300,7 +286,7 @@ function action_upgrade()
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),
@@ -317,28 +303,14 @@ function action_upgrade()
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)