X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=libs%2Fsgi-webuci%2Froot%2Fusr%2Flib%2Fboa%2Fluci.lua;h=387d577d6067fa6ef9e4545b808bce383eda74d3;hp=c0dab39bcd28f6f4659806dee1b8049b47247c5a;hb=d463d0b8357764ca9018549fa624c428f56fcd87;hpb=f7fab0d54f3dfedb3a568c30f2569bd1b3cef5fe

diff --git a/libs/sgi-webuci/root/usr/lib/boa/luci.lua b/libs/sgi-webuci/root/usr/lib/boa/luci.lua
index c0dab39bc..387d577d6 100644
--- a/libs/sgi-webuci/root/usr/lib/boa/luci.lua
+++ b/libs/sgi-webuci/root/usr/lib/boa/luci.lua
@@ -20,12 +20,13 @@ function init(path)
 
 	require("luci.dispatcher")
 	require("luci.sgi.webuci")
-	require("uci")
+	require("luci.model.uci")
 
 	if (root ~= '/') then
 		-- Entering dummy mode
-		uci.set_savedir(root..'/tmp/.uci')
-		uci.set_confdir(root..'/etc/config')
+		luci.model.uci.cursor = function(config, ...)
+			return uci2.cursor(config or root .. "/etc/config", ...)
+	    	end
 		
 		luci.sys.hostname = function() return "" end
 		luci.sys.loadavg  = function() return 0,0,0,0,0 end
@@ -35,7 +36,7 @@ function init(path)
 		
 		luci.sys.net.arptable		= function() return {} end
 		luci.sys.net.devices		= function() return {} end
-		luci.sys.net.routes			= function() return {} end
+		luci.sys.net.routes		= function() return {} end
 		luci.sys.wifi.getiwconfig	= function() return {} end
 		luci.sys.wifi.iwscan		= function() return {} end
 		
@@ -57,8 +58,8 @@ function handle_req(context)
 	env.PATH_INFO       = context.uri
 	env.REMOTE_PORT     = context.remote_port
 	env.SERVER_ADDR     = context.server_addr
+	env.HTTP_COOKIE     = context.cookie
 	env.SCRIPT_NAME     = env.REQUEST_URI:sub(1, #env.REQUEST_URI - #env.PATH_INFO)
 
-	luci.sgi.webuci.initenv(env, vars)
-	luci.dispatcher.httpdispatch()
+	luci.sgi.webuci.run(env, vars)
 end