From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon, 21 Oct 2013 23:44:03 +0000 (-0500)
Subject: get rid of '${lxcpath}_anon' idea
X-Git-Tag: lxc-1.0.0.alpha3~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69733b5dd27e6963267ff6473d9b41dfb59a3f0f;p=thirdparty%2Flxc.git

get rid of '${lxcpath}_anon' idea

The idea was simply misguided.

If you provide a custom configuration file, you still should be
putting the command sock into the real lxcpath, not an 'anon' one.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index a894513bc..2e3c3b30b 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -153,7 +153,6 @@ int main(int argc, char *argv[])
 	};
 	FILE *pid_fp = NULL;
 	struct lxc_container *c;
-	char *anonpath;
 
 	lxc_list_init(&defines);
 
@@ -172,8 +171,8 @@ int main(int argc, char *argv[])
 			 my_args.progname, my_args.quiet, my_args.lxcpath[0]))
 		return err;
 
-	anonpath = alloca(strlen(LXCPATH) + 6);
-	sprintf(anonpath, "%s_anon", LXCPATH);
+	const char *lxcpath = my_args.lxcpath[0];
+
 	/*
 	 * rcfile possibilities:
 	 * 1. rcfile from random path specified in cli option
@@ -183,7 +182,7 @@ int main(int argc, char *argv[])
 	/* rcfile is specified in the cli option */
 	if (my_args.rcfile) {
 		rcfile = (char *)my_args.rcfile;
-		c = lxc_container_new(my_args.name, anonpath);
+		c = lxc_container_new(my_args.name, lxcpath);
 		if (!c) {
 			ERROR("Failed to create lxc_container");
 			return err;
@@ -195,7 +194,6 @@ int main(int argc, char *argv[])
 		}
 	} else {
 		int rc;
-		const char *lxcpath = my_args.lxcpath[0];
 
 		rc = asprintf(&rcfile, "%s/%s/config", lxcpath, my_args.name);
 		if (rc == -1) {
@@ -208,7 +206,6 @@ int main(int argc, char *argv[])
 		if (access(rcfile, F_OK)) {
 			free(rcfile);
 			rcfile = NULL;
-			lxcpath = anonpath;
 		}
 		c = lxc_container_new(my_args.name, lxcpath);
 		if (!c) {