proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-17 00:00:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

python: Remove hardcoded LXCPATH

Browse Source 
Switch the python scripts to using @LXCPATH@.

According to grep, this was the last occurence of a /var/*/lxc
path in the code.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Stéphane Graber 2012-12-05 18:51:10 -05:00
parent fe253caa8b
commit 2495cc911b
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -271,6 +271,8 @@ AC_CONFIG_FILES([
src/lxc/legacy/lxc-ls src/lxc/legacy/lxc-ls
src/python-lxc/Makefile src/python-lxc/Makefile
src/python-lxc/lxc/__init__.py
src/python-lxc/examples/api_test.py
src/tests/Makefile src/tests/Makefile

2
src/python-lxc/examples/api_test.py → src/python-lxc/examples/api_test.py.in
View File

@ -30,7 +30,7 @@ import uuid
import sys import sys
# Some constants # Some constants
LXC_PATH_LIB = "/var/lib/lxc" LXC_PATH_LIB = "@LXCPATH@"
LXC_TEMPLATE = "ubuntu" LXC_TEMPLATE = "ubuntu"
# Let's pick a random name, avoiding clashes # Let's pick a random name, avoiding clashes

2
src/python-lxc/lxc/__init__.py → src/python-lxc/lxc/__init__.py.in
View File

@ -465,7 +465,7 @@ def list_containers(as_object=False):
List the containers on the system. List the containers on the system.
""" """
containers = [] containers = []
for entry in glob.glob("/var/lib/lxc/*/config"): for entry in glob.glob("@LXCPATH@/*/config"):
if as_object: if as_object:
containers.append(Container(entry.split("/")[-2])) containers.append(Container(entry.split("/")[-2]))
else: else: