Fixed some UCI transition fallout

diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci
index f150cae8d637de42b28cf9ff32ccedc7f07099f4..3c7ab070d2fb785c45a78d39b22bb21640a60a60 100755 (executable)
--- 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 387d577d6067fa6ef9e4545b808bce383eda74d3..6cb019d16ad6e601b321ef5c590d966825414639 100644 (file)
--- 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