openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-25 18:24:51 +04:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-lxc: Use correct path for configuration

Browse Source 
Adjusting LuCI app for LXC to try to read path to your LXC containers from
configuration file and if not succeeding falling back to /srv/lxc to match
previous commit.

Signed-off-by: Michal Hrusecky <michal.hrusecky@nic.cz>
This commit is contained in:
Michal Hrusecky
2016-06-09 09:42:15 +02:00
parent 0708c4171e
commit 287edf574d
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utils/luci-app-lxc/files/controller/lxc.lua
View File

@@ -93,10 +93,22 @@ function lxc_action(lxc_action, lxc_name)
luci.http.write_json(ec and {} or data)
end
function lxc_get_config_path()
local f = io.open("/etc/lxc/lxc.conf", "r")
local content = f:read("*all")
f:close()
local ret = content:match('^%s*lxc.lxcpath%s*=%s*([^%s]*)')
if ret then
return ret .. "/"
else
return "/srv/lxc/"
end
end
function lxc_configuration_get(lxc_name)
luci.http.prepare_content("text/plain")
local f = io.open("/lxc/" .. lxc_name .. "/config", "r")
local f = io.open(lxc_get_config_path() .. lxc_name .. "/config", "r")
local content = f:read("*all")
f:close()
@@ -112,7 +124,7 @@ function lxc_configuration_set(lxc_name)
return luci.http.write("1")
end
local f, err = io.open("/lxc/" .. lxc_name .. "/config","w+")
local f, err = io.open(lxc_get_config_path() .. lxc_name .. "/config","w+")
if not f then
return luci.http.write("2")
end