aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-02-18 14:41:57 -0500
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-02-18 14:42:02 -0500
commit20accf6d7cf8330f26be3718c96edf6dae14b4f0 (patch)
treeec7af1be21adf0f507112dda042b92d14359a5a5
parent323c1bb6f46076149a58b0561f2555afafde6990 (diff)
lxc: add missing patchHEADmaster
As reported by Chris Larson, the recipe went in, but not the patch. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch b/recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch
new file mode 100644
index 0000000..3e299d2
--- /dev/null
+++ b/recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch
@@ -0,0 +1,27 @@
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 6b3f318..2f8b9e6 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -2072,7 +2072,12 @@ 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);
++ if (!new->rootfs.mount) {
++ ERROR("lxc_conf_init : %m");
++ free(new);
++ return NULL;
++ }
+ new->kmsg = 1;
+ lxc_list_init(&new->cgroup);
+ lxc_list_init(&new->network);
+@@ -3084,7 +3089,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);