X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-core%2Fluasrc%2Fcontroller%2Fadmin%2Fsystem.lua;h=81034fddfab0dd2027b7cf2926202586941c9d53;hp=d449f48017bec5c411eca4c5a1b634d08785191a;hb=dd9606825da5d73883b8313f5af905ea1b2a4d7d;hpb=75f3dbaa6136a1288fbe92d80fc127f5228f5d64

diff --git a/modules/admin-core/luasrc/controller/admin/system.lua b/modules/admin-core/luasrc/controller/admin/system.lua
index d449f48017..81034fddfa 100644
--- a/modules/admin-core/luasrc/controller/admin/system.lua
+++ b/modules/admin-core/luasrc/controller/admin/system.lua
@@ -1,12 +1,5 @@
 module("luci.controller.admin.system", package.seeall)
 
-require("luci.sys")
-require("luci.http")
-require("luci.util")
-require("luci.fs")
-require("luci.model.ipkg")
-require("luci.model.uci")
-
 function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
@@ -65,7 +58,7 @@ function action_ipkg()
 end
 
 function action_packages()
-	local ipkg = luci.model.ipkg
+	local ipkg = require("luci.model.ipkg")
 	local void = nil
 	local submit = luci.http.formvalue("submit")
 	
@@ -190,6 +183,7 @@ function action_sshkeys()
 end
 
 function action_upgrade()
+	require("luci.model.uci")
 	local ret  = nil
 	local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
 	
@@ -199,7 +193,7 @@ function action_upgrade()
 	if plat and image then
 		local kpattern = nil
 		if keepcfg then
-			local files = luci.model.uci.sections("luci").flash_keep
+			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