libs/sys: fix luci.sys.checkpasswd() semantics

[project/luci.git] / libs / sys / luasrc / sys.lua

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 53204b10b1ccc1724cf88fdcada9f3b48c77abb3..18c79119f7f7ebac341e158b3e730ce97fc468b9 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -183,6 +183,7 @@ function sysinfo()
                cpuinfo:match("model name\t+: ([^\n]+)")
 
        local model =
+               luci.util.pcdata(fs.readfile("/tmp/sysinfo/model")) or
                cpuinfo:match("machine\t+: ([^\n]+)") or
                cpuinfo:match("Hardware\t+: ([^\n]+)") or
                luci.util.pcdata(fs.readfile("/proc/diag/model")) or
@@ -306,7 +307,7 @@ function net.defaultroute6()
        local route
 
        net.routes6(function(rt)
-               if rt.dest:prefix() == 0 and rt.device ~= "lo" and 
+               if rt.dest:prefix() == 0 and rt.device ~= "lo" and
                   (not route or route.metric > rt.metric)
                then
                        route = rt
@@ -526,6 +527,9 @@ function process.list()
                end
 
                k = luci.util.split(luci.util.trim(line), "%s+", nil, true)
+               if k[6] == "%VSZ" then
+                       k[6] = "%MEM"
+               end
                if k[1] == "PID" then
                        break
                end
@@ -608,11 +612,10 @@ end
 -- @return                     Boolean indicating wheather the passwords are equal
 function user.checkpasswd(username, pass)
        local pwh = user.getpasswd(username)
-       if pwh and nixio.crypt(pass, pwh) ~= pwh then
-               return false
-       else
-               return true
+       if pwh then
+               return (nixio.crypt(pass, pwh) == pwh)
        end
+       return false
 end
 
 --- Change the password of given user.
@@ -786,41 +789,55 @@ function init.names()
        return names
 end
 
---- Test whether the given init script is enabled
+--- Get the index of he given init script
 -- @param name Name of the init script
--- @return             Boolean indicating whether init is enabled
-function init.enabled(name)
+-- @return             Numeric index value
+function init.index(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enabled") == 0 )
+               return call("env -i sh -c 'source %s%s enabled; exit ${START:-255}' >/dev/null"
+                       %{ init.dir, name })
        end
-       return false
 end
 
---- Get the index of he given init script
--- @param name Name of the init script
--- @return             Numeric index value
-function init.index(name)
+local function init_action(action, name)
        if fs.access(init.dir..name) then
-               return call("source "..init.dir..name.." enabled; exit $START")
+               return call("env -i %s%s %s >/dev/null" %{ init.dir, name, action })
        end
 end
 
+--- Test whether the given init script is enabled
+-- @param name Name of the init script
+-- @return             Boolean indicating whether init is enabled
+function init.enabled(name)
+       return (init_action("enabled", name) == 0)
+end
+
 --- Enable the given init script
 -- @param name Name of the init script
 -- @return             Boolean indicating success
 function init.enable(name)
-       if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enable") == 1 )
-       end
+       return (init_action("enable", name) == 1)
 end
 
 --- Disable the given init script
 -- @param name Name of the init script
 -- @return             Boolean indicating success
 function init.disable(name)
-       if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." disable") == 0 )
-       end
+       return (init_action("disable", name) == 0)
+end
+
+--- Start the given init script
+-- @param name Name of the init script
+-- @return             Boolean indicating success
+function init.start(name)
+       return (init_action("start", name) == 0)
+end
+
+--- Stop the given init script
+-- @param name Name of the init script
+-- @return             Boolean indicating success
+function init.stop(name)
+       return (init_action("stop", name) == 0)
 end