build/setup.lua: override luci.model.uci.cursor_state() and clean up code

diff --git a/build/setup.lua b/build/setup.lua
index a3e64f3d19050e755db5b86a5c80876c18e7344a..6b19c5330679af956d4a5d6bcc285c3c54616f49 100644 (file)
--- a/build/setup.lua
+++ b/build/setup.lua
@@ -1,13 +1,25 @@
-            local SYSROOT = os.getenv("LUCI_SYSROOT")
-            require "uci"
-            require "luci.model.uci".cursor = function(config, save)
-                    return uci.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
-            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
-
-           local sys = require "luci.sys"
-           sys.user.checkpasswd = function() return true end
+local SYSROOT = os.getenv("LUCI_SYSROOT")
+
+-- override uci access
+local uci_core  = require "uci"
+local uci_model = require "luci.model.uci"
+
+uci_model.cursor = function(config, save)
+       return uci_core.cursor(config or SYSROOT .. "/etc/config", save or SYSROOT .. "/tmp/.uci")
+end
+
+uci_model.cursor_state = function()
+       return uci_core.cursor(nil, SYSROOT .. "/var/state")
+end
+
+-- override uvl access
+local uvl_model = require "luci.uvl"
+local uvl_init  = uvl_model.UVL.__init__
+
+uvl_model.UVL.__init__ = function(self, schemedir)
+       uvl_init(self, schemedir or SYSROOT .. "/lib/uci/schema")
+end
+
+-- allow any password in local sdk
+local sys = require "luci.sys"
+sys.user.checkpasswd = function() return true end