summaryrefslogtreecommitdiffhomepage
path: root/libs/httpd/host/runluci
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-09-02 14:50:00 +0000
committerSteven Barth <steven@midlink.org>2008-09-02 14:50:00 +0000
commit048fe5ce12c63c910cc92b568ec2fdca90c63d62 (patch)
tree16c88c693661e84aa8d89cb815c8add0ce9a65f2 /libs/httpd/host/runluci
parentb693e1ab915b0d811dd234377afaf8127851bcaf (diff)
Fixed some UCI transition fallout
Diffstat (limited to 'libs/httpd/host/runluci')
-rwxr-xr-xlibs/httpd/host/runluci9
1 files changed, 5 insertions, 4 deletions
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