libs/sys: recent busybox versions changed top output from %MEM to %VSZ, fix luci...

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

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 2bdc15e..f9b253e 100644 (file)
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -185,7 +185,7 @@ function sysinfo()
        local model =
                cpuinfo:match("machine\t+: ([^\n]+)") or
                cpuinfo:match("Hardware\t+: ([^\n]+)") or
-               fs.readfile("/proc/diag/model") or
+               luci.util.pcdata(fs.readfile("/proc/diag/model")) or
                nixio.uname().machine or
                system
 
@@ -240,32 +240,36 @@ function net.conntrack(callback)
                for line in io.lines("/proc/net/nf_conntrack") do
                        line = line:match "^(.-( [^ =]+=).-)%2"
                        local entry, flags = _parse_mixed_record(line, " +")
-                       entry.layer3 = flags[1]
-                       entry.layer4 = flags[3]
-                       for i=1, #entry do
-                               entry[i] = nil
-                       end
+                       if flags[6] ~= "TIME_WAIT" then
+                               entry.layer3 = flags[1]
+                               entry.layer4 = flags[3]
+                               for i=1, #entry do
+                                       entry[i] = nil
+                               end
 
-                       if callback then
-                               callback(entry)
-                       else
-                               connt[#connt+1] = entry
+                               if callback then
+                                       callback(entry)
+                               else
+                                       connt[#connt+1] = entry
+                               end
                        end
                end
        elseif fs.access("/proc/net/ip_conntrack", "r") then
                for line in io.lines("/proc/net/ip_conntrack") do
                        line = line:match "^(.-( [^ =]+=).-)%2"
                        local entry, flags = _parse_mixed_record(line, " +")
-                       entry.layer3 = "ipv4"
-                       entry.layer4 = flags[1]
-                       for i=1, #entry do
-                               entry[i] = nil
-                       end
+                       if flags[4] ~= "TIME_WAIT" then
+                               entry.layer3 = "ipv4"
+                               entry.layer4 = flags[1]
+                               for i=1, #entry do
+                                       entry[i] = nil
+                               end
 
-                       if callback then
-                               callback(entry)
-                       else
-                               connt[#connt+1] = entry
+                               if callback then
+                                       callback(entry)
+                               else
+                                       connt[#connt+1] = entry
+                               end
                        end
                end
        else
@@ -302,7 +306,9 @@ function net.defaultroute6()
        local route
 
        net.routes6(function(rt)
-               if rt.dest:prefix() == 0 and (not route or route.metric > rt.metric) then
+               if rt.dest:prefix() == 0 and rt.device ~= "lo" and 
+                  (not route or route.metric > rt.metric)
+               then
                        route = rt
                end
        end)
@@ -520,6 +526,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
@@ -785,7 +794,7 @@ end
 -- @return             Boolean indicating whether init is enabled
 function init.enabled(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enabled") == 0 )
+               return ( call(init.dir..name.." enabled >/dev/null") == 0 )
        end
        return false
 end
@@ -795,7 +804,7 @@ end
 -- @return             Numeric index value
 function init.index(name)
        if fs.access(init.dir..name) then
-               return call("source "..init.dir..name.." enabled; exit $START")
+               return call("source "..init.dir..name.." enabled >/dev/null; exit $START")
        end
 end
 
@@ -804,7 +813,7 @@ end
 -- @return             Boolean indicating success
 function init.enable(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." enable") == 1 )
+               return ( call(init.dir..name.." enable >/dev/null") == 1 )
        end
 end
 
@@ -813,7 +822,7 @@ end
 -- @return             Boolean indicating success
 function init.disable(name)
        if fs.access(init.dir..name) then
-               return ( call(init.dir..name.." disable") == 0 )
+               return ( call(init.dir..name.." disable >/dev/null") == 0 )
        end
 end