mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

Merge pull request #2742 from miska/master 

lxc: Use more FSH compliant /srv/lxc instead of new root dir
This commit is contained in:
Luka Perkov 2016-06-16 15:59:40 +02:00 committed by GitHub
parent 237d312cdb 287edf574d
commit 3fffe7e1ff
3 changed files with 17 additions and 5 deletions
Show Stats 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

4
utils/lxc/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=lxc
PKG_VERSION:=1.1.5
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@ -199,7 +199,7 @@ define Package/lxc-common/install
./files/lxc.conf \
$(1)/etc/lxc/lxc.conf
$(INSTALL_DIR) $(1)/lxc/
$(INSTALL_DIR) $(1)/srv/lxc/
endef
define Package/lxc-hooks/install

2
utils/lxc/files/lxc.conf
View File

@ -1 +1 @@
lxc.lxcpath = /lxc
lxc.lxcpath = /srv/lxc