c/r: enable hugetlbfs in criu

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@canonical.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

c/r: enable hugetlbfs in criu
dd62857a · Tycho Andersen · Stéphane Graber · 8ba5ced7 · dd62857a
Commit dd62857a authored Apr 20, 2015 by Tycho Andersen Committed by Stéphane Graber Apr 22, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

criu.c src/lxc/criu.c +4 -1

No files found.
--- 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");