fix fallout from nixio.fs transition

diff --git a/libs/uvl/luasrc/uvl.lua b/libs/uvl/luasrc/uvl.lua
index 33f45bf89fc46d246bf79be814d1c1c32b559180..7f149cf759a2917c03b43c7baecf49d6ae8bbbee 100644 (file)
--- a/libs/uvl/luasrc/uvl.lua
+++ b/libs/uvl/luasrc/uvl.lua
@@ -19,11 +19,10 @@ $Id$
 -- @class      module
 -- @cstyle     instance
 
-require "nixio.util"
-
 local fs = require "nixio.fs"
 local uci = require "luci.model.uci"
 local util = require "luci.util"
+local nutil = require "nixio.util"
 local table = require "table"
 local string = require "string"
 
@@ -405,11 +404,11 @@ function UVL.read_scheme( self, shm, alias )
        local bc = "%s/bytecode/%s.lua" %{ self.schemedir, shm }
 
        if not fs.access(bc) then
-               local files = nixio.util.consume(fs.glob(self.schemedir .. '/*/' .. shm))
+               local files = nutil.consume((fs.glob(self.schemedir .. '/*/' .. shm)))
 
                if #files > 0 then
                        local ok, err
-                       for file in files do
+                       for _, file in ipairs(files) do
                                if not fs.access(file) then
                                        return false, so:error(ERR.SME_READ(so,file))
                                end

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index e8f65e3bec969ce10ae98456ed3a154e33020c84..4971033a2723309e30265ec856104bc1bfc90eea 100644 (file)
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -176,7 +176,7 @@ function Template.__init__(self, name)
                local tplmt = fs.stat(sourcefile, "mtime") or fs.stat(sourcefile .. ".htm", "mtime")
                local commt = fs.stat(compiledfile, "mtime")
                
-               if not fs.mtime(cdir) then
+               if not fs.stat(cdir, "mtime") then
                        fs.mkdirr(cdir)
                        fs.chmod(fs.dirname(cdir), 777)
                end

diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm
index 0b37abbdde9e3a2671e26e962f254b9465873048..cd62b80e5facb8a66e701a0e3245c9004cd8e7c6 100644 (file)
--- a/modules/admin-full/luasrc/view/admin_status/routes.htm
+++ b/modules/admin-full/luasrc/view/admin_status/routes.htm
@@ -54,7 +54,7 @@ $Id$
        </fieldset>
        <br />
 
-       <% if fs.access("/proc/net/ipv6_route") then style = true %>
+       <% if nixio.fs.access("/proc/net/ipv6_route") then style = true %>
        <fieldset class="cbi-section" id="cbi-table-table">
                <legend><%:a_n_routes_kernel6%></legend>