[lxc-devel] [PATCH 1/2] c/r: enable hugetlbfs in criu

[Serge Hallyn]

Quoting Tycho Andersen (tycho.andersen at canonical.com):
> In vivid containers hugetlbfs is mounted, but it is not one of the hardcoded
> fses in criu, so we need to tell criu that it is okay to automount it.
> 
> Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/criu.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/src/lxc/criu.c b/src/lxc/criu.c
> index 12b3be9..1a356b2 100644
> --- a/src/lxc/criu.c
> +++ b/src/lxc/criu.c
> @@ -49,7 +49,7 @@ lxc_log_define(lxc_criu, lxc);
>  void exec_criu(struct criu_opts *opts)
>  {
>  	char **argv, log[PATH_MAX];
> -	int static_args = 18, argc = 0, i, ret;
> +	int static_args = 20, argc = 0, i, ret;
>  	int netnr = 0;
>  	struct lxc_list *it;
>  
> @@ -61,6 +61,7 @@ void exec_criu(struct criu_opts *opts)
>  	 * --manage-cgroups action-script foo.sh -D $(directory) \
>  	 * -o $(directory)/$(action).log --ext-mount-map auto
>  	 * --enable-external-sharing --enable-external-masters
> +	 * --enable-fs hugetlbfs
>  	 * +1 for final NULL */
>  
>  	if (strcmp(opts->action, "dump") == 0) {
> @@ -120,6 +121,8 @@ void exec_criu(struct criu_opts *opts)
>  	DECLARE_ARG("auto");
>  	DECLARE_ARG("--enable-external-sharing");
>  	DECLARE_ARG("--enable-external-masters");
> +	DECLARE_ARG("--enable-fs");
> +	DECLARE_ARG("hugetlbfs");
>  	DECLARE_ARG("-D");
>  	DECLARE_ARG(opts->directory);
>  	DECLARE_ARG("-o");
> -- 
> 2.1.4
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel