conf.c: always strdup rootfs.mount

The reason is that the generic code which handles reading lxc.rootfs.mount always frees the old value if not NULL. So without this setting lxc.rootfs.mount = /mnt causes segfault. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

conf.c: always strdup rootfs.mount
54c30e29 · Serge Hallyn · 37903589 · 54c30e29
Commit 54c30e29 authored Jun 18, 2013 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

conf.c src/lxc/conf.c +2 -2

No files found.
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -2134,7 +2134,7 @@ struct lxc_conf *lxc_conf_init(void)
 	new->console.slave = -1;
 	new->console.name[0] = '\0';
 	new->maincmd_fd = -1;
-	new->rootfs.mount = default_rootfs_mount;
+	new->rootfs.mount = strdup(default_rootfs_mount);
 	new->kmsg = 1;
 	lxc_list_init(&new->cgroup);
 	lxc_list_init(&new->network);
@@ -3152,7 +3152,7 @@ void lxc_conf_free(struct lxc_conf *conf)
 		return;
 	if (conf->console.path)
 		free(conf->console.path);
-	if (conf->rootfs.mount != default_rootfs_mount)
+	if (conf->rootfs.mount)
 		free(conf->rootfs.mount);
 	if (conf->rootfs.path)
 		free(conf->rootfs.path);