]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
c/r: enable tracefs
authorTycho Andersen <tycho.andersen@canonical.com>
Fri, 14 Aug 2015 16:24:47 +0000 (10:24 -0600)
committerStéphane Graber <stgraber@ubuntu.com>
Fri, 14 Aug 2015 16:30:34 +0000 (12:30 -0400)
tracefs is a new filesystem that can be mounted by users. Only the options
and fs name need to be passed to restore the state, so we can use criu's
auto fs feature.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
src/lxc/criu.c

index 88dc8cd21f38edc3e7e90ce04bd1b021feb80a4c..798036a95f8f0c7ec41ee730651ebd8255b0695d 100644 (file)
@@ -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 = 20, argc = 0, i, ret;
+       int static_args = 22, argc = 0, i, ret;
        int netnr = 0;
        struct lxc_list *it;
 
@@ -60,7 +60,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
+        * --enable-fs hugetlbfs --enable-fs tracefs
         * +1 for final NULL */
 
        if (strcmp(opts->action, "dump") == 0) {
@@ -122,6 +122,8 @@ void exec_criu(struct criu_opts *opts)
        DECLARE_ARG("--enable-external-masters");
        DECLARE_ARG("--enable-fs");
        DECLARE_ARG("hugetlbfs");
+       DECLARE_ARG("--enable-fs");
+       DECLARE_ARG("tracefs");
        DECLARE_ARG("-D");
        DECLARE_ARG(opts->directory);
        DECLARE_ARG("-o");