X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fcontroller%2Fadmin%2Fsystem.lua;h=69ef6b7aa07beb7d2ef3c2aea2a7f15915582b44;hp=39fe16a7f3569d4ba2c4a07e3e750a279ce016ac;hb=73112f9c44b0dc333b6ec1878009e0e69c8db500;hpb=6088f2b3fe5384f8f0bae1a7842ff8ed98a0f1ee

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 39fe16a7f..69ef6b7aa 100644
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -12,128 +12,109 @@ 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("a_s_packages"), 10)
+
+	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", "admin"}, cbi("admin_system/admin"), i18n("Administration"), 2)
+	entry({"admin", "system", "packages"}, call("action_packages"), i18n("Software"), 10)
 	entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"))
-	entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
-	entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
-	entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
-	entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
+	entry({"admin", "system", "startup"}, form("admin_system/startup"), i18n("Startup"), 45)
+
+	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 luci.fs.isdirectory("/sys/class/leds") then
-		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
+	if nixio.fs.access("/sys/class/leds") then
+		entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("<abbr title=\"Light Emitting Diode\">LED</abbr> Configuration"), 60)
 	end
 
-	entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
-	entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("admin_upgrade"), 80)
-	entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 90)
+	entry({"admin", "system", "backup"}, call("action_backup"), i18n("Backup / Restore"), 70)
+	entry({"admin", "system", "upgrade"}, call("action_upgrade"), i18n("Flash Firmware"), 80)
+	entry({"admin", "system", "reboot"}, call("action_reboot"), i18n("Reboot"), 90)
 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
-		luci.fs.unlink("/tmp/luci-indexcache")
-	end	
+		nixio.fs.unlink("/tmp/luci-indexcache")
+	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 = "gunzip | tar -xC/ >/dev/null 2>&1"
-	local backup_cmd  = "tar -c %s | gzip 2>/dev/null"
-	
-	local restore_fpi 
+	local restore_cmd = "tar -xzC/ >/dev/null 2>&1"
+	local backup_cmd  = "tar -czT %s 2>/dev/null"
+
+	local restore_fpi
 	luci.http.setfilehandler(
 		function(meta, chunk, eof)
 			if not restore_fpi then
@@ -147,21 +128,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
-		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-%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)
+		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")
@@ -174,7 +165,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)
@@ -182,7 +173,7 @@ function action_passwd()
 			stat = 10
 		end
 	end
-	
+
 	luci.template.render("admin_system/passwd", {stat=stat})
 end
 
@@ -198,7 +189,7 @@ function action_upgrade()
 	require("luci.model.uci")
 
 	local tmpfile = "/tmp/firmware.img"
-	
+
 	local function image_supported()
 		-- XXX: yay...
 		return ( 0 == os.execute(
@@ -208,14 +199,14 @@ 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 luci.fs.access("/proc/mtd") then
+		if nixio.fs.access("/proc/mtd") then
 			for l in io.lines("/proc/mtd") do
 				local d, s, e, n = l:match('^([^%s]+)%s+([^%s]+)%s+([^%s]+)%s+"([^%s]+)"')
 				if n == "linux" then
@@ -223,7 +214,7 @@ function action_upgrade()
 					break
 				end
 			end
-		elseif luci.fs.access("/proc/partitions") then
+		elseif nixio.fs.access("/proc/partitions") then
 			for l in io.lines("/proc/partitions") do
 				local x, y, b, n = l:match('^%s*(%d+)%s+(%d+)%s+([^%s]+)%s+([^%s]+)')
 				if b and n and not n:match('[0-9]') then
@@ -240,7 +231,7 @@ function action_upgrade()
 	local file
 	luci.http.setfilehandler(
 		function(meta, chunk, eof)
-			if not luci.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
+			if not nixio.fs.access(tmpfile) and not file and chunk and #chunk > 0 then
 				file = io.open(tmpfile, "w")
 			end
 			if file and chunk then
@@ -256,36 +247,29 @@ function action_upgrade()
 	-- Determine state
 	local keep_avail   = true
 	local step         = tonumber(luci.http.formvalue("step") or 1)
-	local has_image    = luci.fs.access(tmpfile)
+	local has_image    = nixio.fs.access(tmpfile)
 	local has_support  = image_supported()
-	local has_platform = luci.fs.access("/lib/upgrade/platform.sh")
+	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)
-				end
-				fd:close()
-			end
-
-			-- Make sure the device is rebooted
-			luci.sys.reboot()
+			luci.ltn12.pump.all(flash, luci.http.write)
 		end
 
 
@@ -299,9 +283,9 @@ function action_upgrade()
 		-- If there is an image but user has requested step 1
 		-- or type is not supported, then remove it.
 		if has_image then
-			luci.fs.unlink(tmpfile)
+			nixio.fs.unlink(tmpfile)
 		end
-			
+
 		luci.template.render("admin_system/upgrade", {
 			step=1,
 			bad_image=(has_image and not has_support or false),
@@ -314,30 +298,46 @@ function action_upgrade()
 		luci.template.render("admin_system/upgrade", {
 			step=2,
 			checksum=image_checksum(),
-			filesize=luci.fs.stat(tmpfile).size,
+			filesize=nixio.fs.stat(tmpfile).size,
 			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
 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 luci.fs.glob(v) then
-				kpattern = kpattern .. " " ..  v
+function ltn12_popen(command)
+
+	local fdi, fdo = nixio.pipe()
+	local pid = nixio.fork()
+
+	if pid > 0 then
+		fdo:close()
+		local close
+		return function()
+			local buffer = fdi:read(2048)
+			local wpid, stat = nixio.waitpid(pid, "nohang")
+			if not close and wpid and stat == "exited" then
+				close = true
+			end
+
+			if buffer and #buffer > 0 then
+				return buffer
+			elseif close then
+				fdi:close()
+				return nil
 			end
 		end
+	elseif pid == 0 then
+		nixio.dup(fdo, nixio.stdout)
+		fdi:close()
+		fdo:close()
+		nixio.exec("/bin/sh", "-c", command)
 	end
-	return kpattern
 end