aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Normand <michel.mno@free.fr>2009-11-13 22:55:23 +0100
committerDaniel Lezcano <dlezcano@fr.ibm.com>2009-11-13 22:55:23 +0100
commitb0691f8179557405fe1c8ac4b9fc458ea1bff954 (patch)
tree65acd7e2842acc4a7cbfd4f5751e9f26b19eafa7
parentFix lxc-netstat script (diff)
downloadlxc-b0691f8179557405fe1c8ac4b9fc458ea1bff954.tar.gz
lxc-b0691f8179557405fe1c8ac4b9fc458ea1bff954.tar.bz2
lxc-b0691f8179557405fe1c8ac4b9fc458ea1bff954.zip
typo in 488624016575d092d56211347b2bbe8367cd339a (V2)
without this correction, unable to create a container with a configuration file. This is a side effect of commit 488624016575d092d56211347b2bbe8367cd339a Signed-off-by: Michel Normand <michel.mno@free.fr> Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
-rw-r--r--src/lxc/start.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lxc/start.c b/src/lxc/start.c
index e190406..6537780 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -230,7 +230,6 @@ static int console_init(char *console, size_t size)
struct lxc_handler *lxc_init(const char *name, const char *rcfile)
{
struct lxc_handler *handler;
- char path[MAXPATHLEN];
handler = malloc(sizeof(*handler));
if (!handler)
@@ -249,11 +248,13 @@ struct lxc_handler *lxc_init(const char *name, const char *rcfile)
goto out_aborting;
}
- if (rcfile && access(path, F_OK)) {
- ERROR("failed to access rcfile");
- goto out_aborting;
+ if (rcfile) {
+ if (access(rcfile, F_OK)) {
+ ERROR("failed to access rcfile");
+ goto out_aborting;
+ }
- if (lxc_config_read(path, &handler->conf)) {
+ if (lxc_config_read(rcfile, &handler->conf)) {
ERROR("failed to read the configuration file");
goto out_aborting;
}