Commit 69733b5d by Serge Hallyn

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: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 76d376ec
...@@ -153,7 +153,6 @@ int main(int argc, char *argv[]) ...@@ -153,7 +153,6 @@ int main(int argc, char *argv[])
}; };
FILE *pid_fp = NULL; FILE *pid_fp = NULL;
struct lxc_container *c; struct lxc_container *c;
char *anonpath;
lxc_list_init(&defines); lxc_list_init(&defines);
...@@ -172,8 +171,8 @@ int main(int argc, char *argv[]) ...@@ -172,8 +171,8 @@ int main(int argc, char *argv[])
my_args.progname, my_args.quiet, my_args.lxcpath[0])) my_args.progname, my_args.quiet, my_args.lxcpath[0]))
return err; return err;
anonpath = alloca(strlen(LXCPATH) + 6); const char *lxcpath = my_args.lxcpath[0];
sprintf(anonpath, "%s_anon", LXCPATH);
/* /*
* rcfile possibilities: * rcfile possibilities:
* 1. rcfile from random path specified in cli option * 1. rcfile from random path specified in cli option
...@@ -183,7 +182,7 @@ int main(int argc, char *argv[]) ...@@ -183,7 +182,7 @@ int main(int argc, char *argv[])
/* rcfile is specified in the cli option */ /* rcfile is specified in the cli option */
if (my_args.rcfile) { if (my_args.rcfile) {
rcfile = (char *)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) { if (!c) {
ERROR("Failed to create lxc_container"); ERROR("Failed to create lxc_container");
return err; return err;
...@@ -195,7 +194,6 @@ int main(int argc, char *argv[]) ...@@ -195,7 +194,6 @@ int main(int argc, char *argv[])
} }
} else { } else {
int rc; int rc;
const char *lxcpath = my_args.lxcpath[0];
rc = asprintf(&rcfile, "%s/%s/config", lxcpath, my_args.name); rc = asprintf(&rcfile, "%s/%s/config", lxcpath, my_args.name);
if (rc == -1) { if (rc == -1) {
...@@ -208,7 +206,6 @@ int main(int argc, char *argv[]) ...@@ -208,7 +206,6 @@ int main(int argc, char *argv[])
if (access(rcfile, F_OK)) { if (access(rcfile, F_OK)) {
free(rcfile); free(rcfile);
rcfile = NULL; rcfile = NULL;
lxcpath = anonpath;
} }
c = lxc_container_new(my_args.name, lxcpath); c = lxc_container_new(my_args.name, lxcpath);
if (!c) { if (!c) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment