From: Steven Barth <steven@midlink.org>
Date: Tue, 2 Sep 2008 14:50:00 +0000 (+0000)
Subject: Fixed some UCI transition fallout
X-Git-Tag: 0.8.0~186
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=048fe5ce12c63c910cc92b568ec2fdca90c63d62

Fixed some UCI transition fallout
---

diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci
index f150cae8d..3c7ab070d 100755
--- a/libs/httpd/host/runluci
+++ b/libs/httpd/host/runluci
@@ -17,11 +17,12 @@ vhost   = luci.httpd.server.VHost()
 
 server:set_default_vhost(vhost)
 
-if pcall(require, "uci2") and pcall(require, "luci.model.uci") then
-	luci.model.uci.cursor = function(config, save)
-		return uci2.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
+pcall(function()
+	require "uci"
+	require "luci.model.uci".cursor = function(config, save)
+		return uci.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
 	end
-end
+end)
 
 require("luci.sys")
 luci.sys.user.checkpasswd = function() return true end
diff --git a/libs/sgi-webuci/root/usr/lib/boa/luci.lua b/libs/sgi-webuci/root/usr/lib/boa/luci.lua
index 387d577d6..6cb019d16 100644
--- a/libs/sgi-webuci/root/usr/lib/boa/luci.lua
+++ b/libs/sgi-webuci/root/usr/lib/boa/luci.lua
@@ -25,7 +25,7 @@ function init(path)
 	if (root ~= '/') then
 		-- Entering dummy mode
 		luci.model.uci.cursor = function(config, ...)
-			return uci2.cursor(config or root .. "/etc/config", ...)
+			return uci.cursor(config or root .. "/etc/config", ...)
 	    	end
 		
 		luci.sys.hostname = function() return "" end