]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
c/r: don't pass --ext-mount-map flag when console=none
authorTycho Andersen <tycho.andersen@canonical.com>
Mon, 21 Mar 2016 22:50:39 +0000 (16:50 -0600)
committerTycho Andersen <tycho.andersen@canonical.com>
Mon, 21 Mar 2016 22:50:39 +0000 (16:50 -0600)
We don't pass anything on the restore side since we didn't save anything,
but the restore side will expect something if we pass this. Instead, let's
not pass anything.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
src/lxc/criu.c

index 7b72c6ec8462c3129b76f4bec0c4582bf10459d8..1b3c4ac622cf43de3c2b4b4d5ca3a53d24732c58 100644 (file)
@@ -259,9 +259,10 @@ static void exec_criu(struct criu_opts *opts)
                DECLARE_ARG("--freeze-cgroup");
                DECLARE_ARG(log);
 
-               DECLARE_ARG("--ext-mount-map");
-               DECLARE_ARG("/dev/console:console");
                if (opts->tty_id[0]) {
+                       DECLARE_ARG("--ext-mount-map");
+                       DECLARE_ARG("/dev/console:console");
+
                        DECLARE_ARG("--external");
                        DECLARE_ARG(opts->tty_id);
                }