summaryrefslogtreecommitdiffhomepage
path: root/libs/core
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2008-08-06 20:20:40 +0000
committerSteven Barth <steven@midlink.org>2008-08-06 20:20:40 +0000
commit50093ed3d97c763d344f8f6b7bf934e593a92178 (patch)
tree5fa7d666103429e59a88139b5388a3ba24997782 /libs/core
parent76982655fa433edd885bbb80bbe74e82fca527e2 (diff)
Moved luci.sys.libpath to luci.util
Diffstat (limited to 'libs/core')
-rw-r--r--libs/core/luasrc/sys.lua8
-rw-r--r--libs/core/luasrc/util.lua7
2 files changed, 8 insertions, 7 deletions
diff --git a/libs/core/luasrc/sys.lua b/libs/core/luasrc/sys.lua
index c291f6789..14a2f294f 100644
--- a/libs/core/luasrc/sys.lua
+++ b/libs/core/luasrc/sys.lua
@@ -24,7 +24,7 @@ limitations under the License.
]]--
---- LuCI system utilities.
+--- LuCI Linux and POSIX system utilities.
module("luci.sys", package.seeall)
require("posix")
require("luci.bits")
@@ -70,12 +70,6 @@ function httpget(url, stream)
return source("wget -qO- '"..url:gsub("'", "").."'")
end
---- Returns the absolute path to LuCI base directory.
--- @return String containing the directory path
-function libpath()
- return luci.fs.dirname(require("luci.debug").__file__)
-end
-
--- Returns the system load average values.
-- @return String containing the average load value 1 minute ago
-- @return String containing the average load value 5 minutes ago
diff --git a/libs/core/luasrc/util.lua b/libs/core/luasrc/util.lua
index 2f6cfad4c..cd3534f4f 100644
--- a/libs/core/luasrc/util.lua
+++ b/libs/core/luasrc/util.lua
@@ -612,6 +612,13 @@ function execl(command)
return data
end
+--- Returns the absolute path to LuCI base directory.
+-- @return String containing the directory path
+function libpath()
+ return luci.fs.dirname(require("luci.debug").__file__)
+end
+
+
--
-- Coroutine safe xpcall and pcall versions modified for Luci
-- original version: