aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/lxc/lxc_execute.c')
-rw-r--r--src/lxc/lxc_execute.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 40a4b93..50fec10 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
{
static char **args;
char *rcfile;
- struct lxc_conf conf;
+ struct lxc_conf *conf;
if (lxc_arguments_parse(&my_args, argc, argv))
return -1;
@@ -113,16 +113,17 @@ int main(int argc, char *argv[])
}
}
- if (lxc_conf_init(&conf)) {
- ERROR("failed to initialze configuration");
+ conf = lxc_conf_init();
+ if (!conf) {
+ ERROR("failed to initialize configuration");
return -1;
}
- if (rcfile && lxc_config_read(rcfile, &conf)) {
+ if (rcfile && lxc_config_read(rcfile, conf)) {
ERROR("failed to read configuration file");
return -1;
}
- return lxc_start(my_args.name, args, &conf);
+ return lxc_start(my_args.name, args, conf);
}