Apply host-UVL

[project/luci.git] / libs / httpd / host / runluci

diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci
index f150cae..bc56f15 100755 (executable)
--- a/libs/httpd/host/runluci
+++ b/libs/httpd/host/runluci
@@ -1,4 +1,4 @@
-#!/usr/bin/lua
+#!/usr/bin/env lua
 require("luci.httpd")
 require("luci.httpd.server")
 require("luci.httpd.handler.file")
@@ -17,11 +17,17 @@ 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
+
+       local x = require "luci.uvl".UVL.__init__
+       require "luci.uvl".UVL.__init__ = function(self, schemedir)
+               x(self, schemedir or SYSROOT .. "/lib/uci/schema")
+       end
+end)
 
 require("luci.sys")
 luci.sys.user.checkpasswd = function() return true end