diff options
| author | Steven Barth <steven@midlink.org> | 2008-09-02 14:50:00 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-09-02 14:50:00 +0000 |
| commit | 048fe5ce12c63c910cc92b568ec2fdca90c63d62 (patch) | |
| tree | 16c88c693661e84aa8d89cb815c8add0ce9a65f2 | |
| parent | b693e1ab915b0d811dd234377afaf8127851bcaf (diff) | |
Fixed some UCI transition fallout
| -rwxr-xr-x | libs/httpd/host/runluci | 9 | ||||
| -rw-r--r-- | libs/sgi-webuci/root/usr/lib/boa/luci.lua | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci index f150cae8d6..3c7ab070d2 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 387d577d60..6cb019d16a 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 |