diff options
author | Josep Puigdemont <josep.puigdemont@enea.com> | 2014-02-27 12:33:06 +0100 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-28 10:43:21 -0500 |
commit | 9c6a7d37391beb4943abffe609f821e5710a0b3f (patch) | |
tree | b024f4e701b431dba4b07f70a0dd866105649d7c /recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch | |
parent | 20accf6d7cf8330f26be3718c96edf6dae14b4f0 (diff) | |
download | meta-virtualization-9c6a7d37391beb4943abffe609f821e5710a0b3f.tar.gz |
Update Linux Containers to lxc-1.0.0
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch')
-rw-r--r-- | recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch | 27 |
1 files changed, 0 insertions, 27 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 deleted file mode 100644 index 3e299d2f..00000000 --- a/recipes-containers/lxc/files/lxc-0.9.0-always-strdup-rootfs-mount.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | diff --git a/src/lxc/conf.c b/src/lxc/conf.c | ||
2 | index 6b3f318..2f8b9e6 100644 | ||
3 | --- a/src/lxc/conf.c | ||
4 | +++ b/src/lxc/conf.c | ||
5 | @@ -2072,7 +2072,12 @@ struct lxc_conf *lxc_conf_init(void) | ||
6 | new->console.slave = -1; | ||
7 | new->console.name[0] = '\0'; | ||
8 | new->maincmd_fd = -1; | ||
9 | - new->rootfs.mount = default_rootfs_mount; | ||
10 | + new->rootfs.mount = strdup(default_rootfs_mount); | ||
11 | + if (!new->rootfs.mount) { | ||
12 | + ERROR("lxc_conf_init : %m"); | ||
13 | + free(new); | ||
14 | + return NULL; | ||
15 | + } | ||
16 | new->kmsg = 1; | ||
17 | lxc_list_init(&new->cgroup); | ||
18 | lxc_list_init(&new->network); | ||
19 | @@ -3084,7 +3089,7 @@ void lxc_conf_free(struct lxc_conf *conf) | ||
20 | return; | ||
21 | if (conf->console.path) | ||
22 | free(conf->console.path); | ||
23 | - if (conf->rootfs.mount != default_rootfs_mount) | ||
24 | + if (conf->rootfs.mount) | ||
25 | free(conf->rootfs.mount); | ||
26 | if (conf->rootfs.path) | ||
27 | free(conf->rootfs.path); | ||