From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 25 May 2018 13:43:59 +0000 (+0200)
Subject: tools: fix lxc-create with global config value
X-Git-Tag: lxc-2.0.10~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5acde2b638e39aeab5386c09ca6a86304b583685;p=thirdparty%2Flxc.git

tools: fix lxc-create with global config value

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/tools/lxc_create.c b/src/lxc/tools/lxc_create.c
index ef306f5da..5aad38052 100644
--- a/src/lxc/tools/lxc_create.c
+++ b/src/lxc/tools/lxc_create.c
@@ -255,9 +255,12 @@ int main(int argc, char *argv[])
 	}
 
 	if (geteuid()) {
-		if (mkdir_p(my_args.lxcpath[0], 0755)) {
+		if (!my_args.lxcpath[0])
+			my_args.lxcpath[0] = lxc_get_global_config_item("lxc.lxcpath");
+
+		if (mkdir_p(my_args.lxcpath[0], 0755))
 			exit(EXIT_FAILURE);
-		}
+
 		if (access(my_args.lxcpath[0], O_RDONLY) < 0) {
 			fprintf(stderr, "You lack access to %s\n", my_args.lxcpath[0]);
 			exit(EXIT_FAILURE);