aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordlezcano <dlezcano>2008-10-07 14:22:49 +0000
committerdlezcano <dlezcano>2008-10-07 14:22:49 +0000
commit8c6c9475493673ee4e7e5b8acb4e53df8312cee2 (patch)
tree82513002a167412929ff0d89d3753c50a67c4eb3
parentChange version to 3.2.0 (diff)
downloadlxc-8c6c9475493673ee4e7e5b8acb4e53df8312cee2.tar.gz
lxc-8c6c9475493673ee4e7e5b8acb4e53df8312cee2.tar.bz2
lxc-8c6c9475493673ee4e7e5b8acb4e53df8312cee2.zip
Fix missing container name, reorder subsystems component
-rw-r--r--src/lxc/lxc_conf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index 9651b50..08c6cd6 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -654,7 +654,7 @@ static int setup_cgroup_cb(const char *name, const char *dirname,
const char *file, void *data)
{
if (lxc_cgroup_copy(name, file))
- lxc_log_warning("failed to setup '%s'");
+ lxc_log_warning("failed to setup '%s'", name);
return 0;
}
@@ -1290,13 +1290,13 @@ int lxc_setup(const char *name)
return -1;
}
- if (conf_has_fstab(name) && setup_mount(name)) {
- lxc_log_error("failed to setup the mount points for '%s'", name);
+ if (conf_has_cgroup(name) && setup_cgroup(name)) {
+ lxc_log_error("failed to setup the cgroups for '%s'", name);
return -1;
}
- if (conf_has_cgroup(name) && setup_cgroup(name)) {
- lxc_log_error("failed to setup the cgroups for '%s'", name);
+ if (conf_has_fstab(name) && setup_mount(name)) {
+ lxc_log_error("failed to setup the mount points for '%s'", name);
return -1;
}