From: Christian Brauner <christian.brauner@mailbox.org>
Date: Mon, 11 Jan 2016 13:43:42 +0000 (+0100)
Subject: fix lockpath removal in Python lxc-ls
X-Git-Tag: lxc-2.0.0.beta2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d62583ac541a7032f586640c52e0dce197a308d;p=thirdparty%2Flxc.git

fix lockpath removal in Python lxc-ls

The lock path for lxc is not

	RUNTIME_PATH/lock/lxc

but rather

	RUNTIME_PATH/lxc/lock

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxc-ls.in b/src/lxc/lxc-ls.in
index dc2b2ba8d..b83ee7391 100755
--- a/src/lxc/lxc-ls.in
+++ b/src/lxc/lxc-ls.in
@@ -392,7 +392,7 @@ def get_containers(fd=None, base="/", root=False):
                 else:
                     def clear_lock():
                         try:
-                            lock_path = "%s/lock/lxc/%s/%s" % (RUNTIME_PATH,
+                            lock_path = "%s/lxc/lock/%s/%s" % (RUNTIME_PATH,
                                                                path,
                                                                entry['name'])
                             if os.path.exists(lock_path):