lxc-checkpoint: use --force-irmap criu option

This option is required when migrating containers across hosts; it is used to
restore inotify via file paths instead of file handles, which aren't preserved
across hosts.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 07a63e7ec5f3b6107be28e7983d8811838f41300..dca0c5dad2e606e7d7916446dd81df5ebf3ff825 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3517,11 +3517,12 @@ static int read_criu_file(const char *directory, const char *file, int netnr, ch
 static void exec_criu(struct criu_opts *opts)
 {
        char **argv, log[PATH_MAX];
-       int static_args = 13, argc = 0, i, ret;
+       int static_args = 14, argc = 0, i, ret;
 
        /* The command line always looks like:
-        * criu $(action) --tcp-established --file-locks --link-remap --manage-cgroups \
-        *     --action-script foo.sh -D $(directory) -o $(directory)/$(action).log
+        * criu $(action) --tcp-established --file-locks --link-remap --force-irmap \
+        * --manage-cgroups action-script foo.sh -D $(directory) \
+        * -o $(directory)/$(action).log
         * +1 for final NULL */
 
        if (strcmp(opts->action, "dump") == 0) {
@@ -3570,6 +3571,7 @@ static void exec_criu(struct criu_opts *opts)
        DECLARE_ARG("--tcp-established");
        DECLARE_ARG("--file-locks");
        DECLARE_ARG("--link-remap");
+       DECLARE_ARG("--force-irmap");
        DECLARE_ARG("--manage-cgroups");
        DECLARE_ARG("--action-script");
        DECLARE_ARG(LIBEXECDIR "/lxc/lxc-restore-net");